Fixes #378

Author: isc-bsaviano

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [2.7.5] - 2025-XX-XX
+- Fix issue [#378](https://github.com/intersystems/language-server/issues/378): Remove `intersystems.language-server.completion.showInternal` setting
+
 ## [2.7.4] - 2025-06-30
 - Fix issue [#373](https://github.com/intersystems/language-server/issues/373): Add go to definition and hover support for `UrlMap` Call and Forward attribute values
 - Fix issue [#374](https://github.com/intersystems/language-server/issues/374): `undefined` items appearing in completion lists for XML XData

package.json

@@ -237,12 +237,6 @@
           "default": true,
           "description": "Controls whether diagnostics are provided when a local variable may be undefined."
         },
-        "intersystems.language-server.completion.showInternal": {
-          "scope": "window",
-          "type": "boolean",
-          "default": false,
-          "markdownDescription": "Controls whether class members with the `Internal` keyword and system globals are shown in completion lists."
-        },
         "intersystems.language-server.completion.showGenerated": {
           "scope": "window",
           "type": "boolean",

server/src/providers/completion.ts

@@ -1,5 +1,5 @@
 import { CompletionItem, CompletionItemKind, CompletionItemTag, CompletionParams, InsertTextFormat, MarkupKind, Position, Range, TextEdit } from 'vscode-languageserver/node';
-import { getServerSpec, getLanguageServerSettings, getMacroContext, makeRESTRequest, normalizeSystemName, getImports, findFullRange, getClassMemberContext, quoteUDLIdentifier, documaticHtmlToMarkdown, determineClassNameParameterClass, storageKeywordsKeyForToken, getParsedDocument, currentClass, normalizeClassname, macroDefToDoc } from '../utils/functions';
+import { getServerSpec, getLanguageServerSettings, getMacroContext, makeRESTRequest, normalizeSystemName, getImports, findFullRange, getClassMemberContext, quoteUDLIdentifier, documaticHtmlToMarkdown, determineClassNameParameterClass, storageKeywordsKeyForToken, getParsedDocument, currentClass, normalizeClassname, macroDefToDoc, showInternalForServer } from '../utils/functions';
 import { ServerSpec, QueryData, KeywordDoc, MacroContext, compressedline, LanguageServerConfiguration } from '../utils/types';
 import { documents, corePropertyParams, mppContinue } from '../utils/variables';
 import * as ld from '../utils/languageDefinitions';
@@ -702,7 +702,7 @@ async function globalsOrRoutines(
 			parameters: [`${prefix.length ? `${prefix.slice(0,-1)}/` : ""}*.mac,*.int,*.obj`]
 		} : {
 			query: "SELECT Name FROM %SYS.GlobalQuery_NameSpaceList(,?,?,,,1,0)",
-			parameters: [`${prefix}*`,settings.completion.showInternal ? 1 : 0]
+			parameters: [`${prefix}*`,(await showInternalForServer(server)) ? 1 : 0]
 		}
 	);
 	if (Array.isArray(respdata?.data?.result?.content) && respdata.data.result.content.length > 0) {
@@ -1083,8 +1083,8 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 		thistoken !== 0 && (triggerlang === ld.cos_langindex || triggerlang === ld.cls_langindex)) ||
 		(prevline.endsWith(".#") && triggerlang === ld.cos_langindex)
 	) {
-		var prevtokentype = "";
-		var prevtokentext = "";
+		let prevtokentype = "";
+		let prevtokentext = "";
 		const prevtokenrange = findFullRange(params.position.line,parsed,thistoken-1,parsed[params.position.line][thistoken-1].p,parsed[params.position.line][thistoken-1].p+parsed[params.position.line][thistoken-1].c);
 		prevtokentext = doc.getText(prevtokenrange);
 		if ((parsed[params.position.line][thistoken-1].l == ld.cls_langindex && parsed[params.position.line][thistoken-1].s == ld.cls_clsname_attrindex) ||
@@ -1163,7 +1163,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 		else {
 			// This is a class member
 
-			const internalStr = !settings.completion.showInternal ? " AND Internal = 0": "";
+			const internalStr = !(await showInternalForServer(server)) ? " AND Internal = 0": "";
 			const deprecatedStr = !settings.completion.showDeprecated ? " AND Deprecated = 0" : "";
 			if (prevline.slice(-2) === ".#") {
 				// Get the base class that this member is in
@@ -1465,7 +1465,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 		const data: QueryData = {
 			query: `SELECT Name, Description, Origin, Type, Deprecated FROM %Dictionary.CompiledParameter WHERE Parent = ?${
 				isProperty ? " OR Parent %INLIST (SELECT $LISTFROMSTRING(PropertyClass) FROM %Dictionary.CompiledClass WHERE Name = ?)" : ""
-			}${!settings.completion.showInternal ? " AND Internal = 0": ""}${!settings.completion.showDeprecated ? " AND Deprecated = 0": ""}`,
+			}${!(await showInternalForServer(server)) ? " AND Internal = 0": ""}${!settings.completion.showDeprecated ? " AND Deprecated = 0": ""}`,
 			parameters: isProperty ? [normalizedcls,currentClass(doc,parsed)] : [normalizedcls]
 		};
 		const respdata = await makeRESTRequest("POST",1,"/action/query",server,data);
@@ -1736,14 +1736,14 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 					// List of methods
 
 					// Find the class name
-					var thisclass = "";
+					let thisclass = "";
 					for (let i = 0; i < parsed.length; i++) {
 						if (parsed[i].length === 0) {
 							continue;
 						}
 						else if (parsed[i][0].l == ld.cls_langindex && parsed[i][0].s == ld.cls_keyword_attrindex) {
 							// This line starts with a UDL keyword
-							var keyword = doc.getText(Range.create(Position.create(i,parsed[i][0].p),Position.create(i,parsed[i][0].p+parsed[i][0].c)));
+							const keyword = doc.getText(Range.create(Position.create(i,parsed[i][0].p),Position.create(i,parsed[i][0].p+parsed[i][0].c)));
 							if (keyword.toLowerCase() === "class") {
 								for (let j = 1; j < parsed[i].length; j++) {
 									if (parsed[i][j].l == ld.cls_langindex && parsed[i][j].s == ld.cls_clsname_attrindex) {
@@ -1760,7 +1760,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 					}
 					const querydata = {
 						query: `SELECT Name, Description, Origin FROM %Dictionary.CompiledMethod WHERE Parent = ?${
-							!settings.completion.showInternal ? " AND Internal = 0": ""
+							!(await showInternalForServer(server)) ? " AND Internal = 0": ""
 						}`,
 						parameters:[thisclass]
 					};
@@ -2165,11 +2165,12 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 			// If we couldn't determine the class, don't return anything
 			return null;
 		}
+		const showInternal = await showInternalForServer(server);
 
 		// Query the server to get the names and descriptions of all non-calculated properties
 		const data: QueryData = {
 			query: `SELECT Name, Description, Origin, RuntimeType, Deprecated FROM %Dictionary.CompiledProperty WHERE Parent = ? AND Calculated = 0${
-				!settings.completion.showInternal ? " AND Internal = 0": ""
+				!showInternal ? " AND Internal = 0": ""
 			}${!settings.completion.showDeprecated ? " AND Deprecated = 0" : ""}`,
 			parameters: [thisclass]
 		}

server/src/providers/refactoring.ts

@@ -15,7 +15,7 @@ import parameterTypes = require("../documentation/parameterTypes.json");
 
 import * as ld from '../utils/languageDefinitions';
 import { compressedline, QueryData, ServerSpec } from '../utils/types';
-import { getServerSpec, findFullRange, makeRESTRequest, quoteUDLIdentifier, parseDimLine, getLanguageServerSettings, getParsedDocument, memberRegex } from '../utils/functions';
+import { getServerSpec, findFullRange, makeRESTRequest, quoteUDLIdentifier, parseDimLine, getLanguageServerSettings, getParsedDocument, memberRegex, showInternalForServer } from '../utils/functions';
 import { documents, connection, zutilFunctions } from '../utils/variables';
 
 /**
@@ -216,32 +216,29 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 	const parsed = await getParsedDocument(params.uri);
 	if (parsed === undefined) {return [];}
 	const server: ServerSpec = await getServerSpec(params.uri);
-	var result: QuickPickItem[] = [];
+	const result: QuickPickItem[] = [];
 
 	// Determine what class this is
-	var thisclass = "";
+	let thisclass = "";
 	for (let ln = 0; ln < parsed.length; ln++) {
-		if (parsed[ln].length === 0) {
-			continue;
-		}
-		else if (parsed[ln][0].l == ld.cls_langindex && parsed[ln][0].s == ld.cls_keyword_attrindex) {
-			// This line starts with a UDL keyword
-
-			var keyword = doc.getText(Range.create(Position.create(ln,parsed[ln][0].p),Position.create(ln,parsed[ln][0].p+parsed[ln][0].c))).toLowerCase();
-			if (keyword === "class") {
-				thisclass = doc.getText(findFullRange(ln,parsed,1,parsed[ln][1].p,parsed[ln][1].p+parsed[ln][1].c));
-				break;
-			}
+		if (!parsed[ln]?.length) continue;
+		if (
+			parsed[ln][0].l == ld.cls_langindex && parsed[ln][0].s == ld.cls_keyword_attrindex &&
+			doc.getText(Range.create(ln,parsed[ln][0].p,ln,parsed[ln][0].p+parsed[ln][0].c)).toLowerCase() == "class"
+		) {
+			thisclass = doc.getText(findFullRange(ln,parsed,1,parsed[ln][1].p,parsed[ln][1].p+parsed[ln][1].c));
+			break;
 		}
 	}
 
 	if (thisclass !== "") {
 		// We found the name of this class
 
+		const showInternalStr = await showInternalForServer(server) ? "" : " AND Internal = 0";
 		// Build the list of QuickPickItems
 		if (params.memberType === "Method") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, ClassMethod, ReturnType FROM %Dictionary.CompiledMethod WHERE Parent = ? AND Stub IS NULL AND Origin != ? AND Final = 0 AND NotInheritable = 0",
+				query: `SELECT Name, Origin, ClassMethod, ReturnType FROM %Dictionary.CompiledMethod WHERE Parent = ? AND Stub IS NULL AND Origin != ? AND Final = 0 AND NotInheritable = 0${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);
@@ -266,7 +263,7 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 		}
 		else if (params.memberType === "Parameter") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, Type FROM %Dictionary.CompiledParameter WHERE Parent = ? AND Origin != ? AND Final = 0",
+				query: `SELECT Name, Origin, Type FROM %Dictionary.CompiledParameter WHERE Parent = ? AND Origin != ? AND Final = 0${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);
@@ -282,7 +279,7 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 		}
 		else if (params.memberType === "Projection") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, Type FROM %Dictionary.CompiledProjection WHERE Parent = ? AND Origin != ?",
+				query: `SELECT Name, Origin, Type FROM %Dictionary.CompiledProjection WHERE Parent = ? AND Origin != ?${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);
@@ -298,7 +295,7 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 		}
 		else if (params.memberType === "Property") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, Type FROM %Dictionary.CompiledProperty WHERE Parent = ? AND Origin != ? AND Final = 0",
+				query: `SELECT Name, Origin, Type FROM %Dictionary.CompiledProperty WHERE Parent = ? AND Origin != ? AND Final = 0${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);
@@ -314,7 +311,7 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 		}
 		else if (params.memberType === "Query") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, Type FROM %Dictionary.CompiledQuery WHERE Parent = ? AND Origin != ? AND Final = 0",
+				query: `SELECT Name, Origin, Type FROM %Dictionary.CompiledQuery WHERE Parent = ? AND Origin != ? AND Final = 0${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);
@@ -330,7 +327,7 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 		}
 		else if (params.memberType === "Trigger") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, Event FROM %Dictionary.CompiledTrigger WHERE Parent = ? AND Origin != ? AND Final = 0",
+				query: `SELECT Name, Origin, Event FROM %Dictionary.CompiledTrigger WHERE Parent = ? AND Origin != ? AND Final = 0${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);
@@ -346,7 +343,7 @@ export async function listOverridableMembers(params: ListOverridableMembersParam
 		}
 		else if (params.memberType === "XData") {
 			const querydata: QueryData = {
-				query: "SELECT Name, Origin, MimeType FROM %Dictionary.CompiledXData WHERE Parent = ? AND Origin != ?",
+				query: `SELECT Name, Origin, MimeType FROM %Dictionary.CompiledXData WHERE Parent = ? AND Origin != ?${showInternalStr}`,
 				parameters: [thisclass,thisclass]
 			};
 			const respdata = await makeRESTRequest("POST",1,"/action/query",server,querydata);

server/src/utils/functions.ts

@@ -2895,3 +2895,18 @@ export function determineActiveParam(text: string): number {
 	});
 	return activeParam;
 }
+
+const showInternalCache: Map<string,boolean> = new Map();
+
+/** Determine if class members with the `Internal` keyword and system globals should be shown in the completion list */
+export async function showInternalForServer(server: ServerSpec): Promise<boolean> {
+	const key = `${server.host}::${server.port}::${server.pathPrefix}::${server.username}`;
+	let result = showInternalCache.get(key);
+	if (result != undefined) return result;
+	result = await makeRESTRequest("POST",1,"/action/query",server,{
+		query: "SELECT Name FROM %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?)",
+		parameters: ["%Library.ConstraintRelationship.cls",1,1,1,1,0,0]
+	}).then((respdata) => respdata?.data?.result?.content?.length > 0).catch(() => false);
+	showInternalCache.set(key,result);
+	return result;
+}

server/src/utils/types.ts

@@ -40,7 +40,6 @@ export type LanguageServerConfiguration = {
 	},
 	completion: {
 		showGenerated: boolean,
-		showInternal: boolean,
 		showDeprecated: boolean
 	}
 };