Fixes #325

intersystems · Apr 19, 2024 · c07bd63 · c07bd63
1 parent bd0c373
commit c07bd63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Fix issue [#322](https://github.com/intersystems/language-server/issues/322): Add setting to disable undefined variable warning diagnostics
 - Fix issue [#323](https://github.com/intersystems/language-server/issues/323): Go to definition on `##super()` will open the superclass's implementation
 - Fix issue [#324](https://github.com/intersystems/language-server/issues/324): Add intellisense for variables set to JSON literal constructors
+- Fix issue [#325](https://github.com/intersystems/language-server/issues/325): Don't sort inherited `%%OID` members at the top of completion lists
 - Parser changes:
   - DP-430347: Track variables in routine procedure blocks
   - DP-430473: Fix variable tracking with embedded SQL in routine procedure blocks

diff --git a/server/src/providers/completion.ts b/server/src/providers/completion.ts
@@ -33,6 +33,9 @@ export let schemaCaches: Map<ServerSpec, SchemaCache> = new Map();
  */
 var macroCompletionCache: MacroContext;
 
+/** Prefix for `sortText` used to bubble base class members to the top of the list. */
+const sortPrefix = "!!!";
+
 /**
  * Mapping between an XML prefix and namespace.
  */
@@ -1112,7 +1115,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 						}
 						if (memobj.Origin === membercontext.baseclass) {
 							// Members from the base class should appear first
-							item.sortText = "##" + quotedname;
+							item.sortText = sortPrefix + quotedname;
 						}
 						else {
 							item.sortText = item.label;
@@ -1249,15 +1252,15 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 									result.push({
 										...item,
 										label: quoted,
-										sortText: memobj.Origin == membercontext.baseclass ? "##" + quoted : quoted,
+										sortText: memobj.Origin == membercontext.baseclass ? sortPrefix + quoted : quoted,
 										tags: memobj.Deprecated ? [CompletionItemTag.Deprecated] : undefined
 									});
 								});
 							}
 						}
 						if (memobj.Origin === membercontext.baseclass) {
 							// Members from the base class should appear first
-							item.sortText = "##" + quotedname;
+							item.sortText = sortPrefix + quotedname;
 						}
 						else {
 							item.sortText = item.label;
@@ -1393,7 +1396,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 				}
 				if (memobj.Origin === normalizedcls) {
 					// Members from the base class should appear first
-					item.sortText = "##" + memobj.Name;
+					item.sortText = sortPrefix + memobj.Name;
 				}
 				if (memobj.Deprecated) {
 					item.tags = [CompletionItemTag.Deprecated];
@@ -1679,7 +1682,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 							};
 							if (method.Origin === method.baseclass) {
 								// Members from the base class should appear first
-								item.sortText = "##" + method.Name;
+								item.sortText = sortPrefix + method.Name;
 							}
 							else {
 								item.sortText = item.label;
@@ -2091,7 +2094,7 @@ export async function onCompletion(params: CompletionParams): Promise<Completion
 				}
 				if (memobj.Origin === thisclass) {
 					// Members from the base class should appear first
-					item.sortText = "##" + quotedname;
+					item.sortText = sortPrefix + quotedname;
 				}
 				else {
 					item.sortText = item.label;