Migrate procedure completion

Author: znorman-harris

libs/parsing/index/src/lib/auto-complete/auto-complete-recipe.interface.ts

@@ -22,6 +22,10 @@ import {
   IKeywordCompletionOptions,
   KeywordCompletion,
 } from './completion-for/completion-keyword.interface';
+import {
+  IProcedureCompletionOptions,
+  ProcedureCompletion,
+} from './completion-for/completion-procedures.interface';
 import {
   ISpecialFunctionCompletionOptions,
   SpecialFunctionCompletion,
@@ -53,6 +57,7 @@ export type AutoCompleteType =
   | FunctionCompletion
   | IncludeCompletion
   | KeywordCompletion
+  | ProcedureCompletion
   | SpecialFunctionCompletion
   | SpecialProcedureCompletion
   | StructureNameCompletion
@@ -75,6 +80,8 @@ export type AutoCompleteRecipeOptions<T extends AutoCompleteType> =
     ? IIncludeCompletionOptions
     : T extends KeywordCompletion
     ? IKeywordCompletionOptions
+    : T extends ProcedureCompletion
+    ? IProcedureCompletionOptions
     : T extends SpecialFunctionCompletion
     ? ISpecialFunctionCompletionOptions
     : T extends SpecialProcedureCompletion

libs/parsing/index/src/lib/auto-complete/build-completion-items.interface.ts

@@ -12,6 +12,7 @@ import { BuildFunctionMethodCompletionItems } from './completion-for/completion-
 import { BuildFunctionCompletionItems } from './completion-for/completion-functions';
 import { BuildIncludeCompletionItems } from './completion-for/completion-include';
 import { BuildKeywordCompletionItems } from './completion-for/completion-keywords';
+import { BuildProcedureCompletionItems } from './completion-for/completion-procedures';
 import { BuildSpecialFunctionCompletionItems } from './completion-for/completion-special-functions';
 import { BuildSpecialProcedureCompletionItems } from './completion-for/completion-special-procedures';
 import { BuildCompletionStructureNameItems } from './completion-for/completion-structure-names';
@@ -52,6 +53,7 @@ export const ALL_COMPLETION_ITEM_BUILDERS: BuildCompletionItemsLookup = {
   function: BuildFunctionCompletionItems,
   include: BuildIncludeCompletionItems,
   keyword: BuildKeywordCompletionItems,
+  procedure: BuildProcedureCompletionItems,
   'special-function': BuildSpecialFunctionCompletionItems,
   'special-procedure': BuildSpecialProcedureCompletionItems,
   'structure-name': BuildCompletionStructureNameItems,

libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedures.interface.ts

@@ -0,0 +1,10 @@
+/**
+ * Auto-complete for procedures
+ */
+export type ProcedureCompletion = 'procedure';
+
+/**
+ * Options for adding procedure completion items
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface IProcedureCompletionOptions {}

…pletion-for/add-completion-procedures.ts …/completion-for/completion-procedures.tslibs/parsing/index/src/lib/auto-complete/completion-for/add-completion-procedures.ts renamed to libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedures.ts libs/parsing/index/src/lib/auto-complete/completion-for/add-completion-procedures.ts renamed to libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedures.ts

@@ -1,33 +1,33 @@
-import { FormatterType, IAssemblerOptions } from '@idl/assembling/config';
 import { TransformCase } from '@idl/assembling/shared';
 import { IDL_DISPLAY_NAMES } from '@idl/parsing/routines';
 import { MAIN_LEVEL_NAME } from '@idl/parsing/syntax-tree';
 import { IDL_TRANSLATION } from '@idl/translation';
 import { GLOBAL_TOKEN_TYPES } from '@idl/types/core';
-import { CompletionItem, CompletionItemKind } from 'vscode-languageserver';
+import { CompletionItemKind } from 'vscode-languageserver';
 
+import { BuildCompletionItemsArg } from '../build-completion-items.interface';
 import { SORT_PRIORITY } from '../sort-priority.interface';
+import { ProcedureCompletion } from './completion-procedures.interface';
 
 /**
  * Display names for procedures
  */
 const PROCEDURES = IDL_DISPLAY_NAMES[GLOBAL_TOKEN_TYPES.PROCEDURE];
 
 /**
- * Adds variables to our completion items
+ * Makes completion items for procedures
  */
-export function AddCompletionProcedures(
-  complete: CompletionItem[],
-  formatting: IAssemblerOptions<FormatterType>
+export function BuildProcedureCompletionItems(
+  arg: BuildCompletionItemsArg<ProcedureCompletion>
 ) {
   // add user procedures first
   const displayNames = Object.values(PROCEDURES);
   for (let i = 0; i < displayNames.length; i++) {
     if (displayNames[i] === MAIN_LEVEL_NAME) {
       continue;
     }
-    complete.push({
-      label: TransformCase(displayNames[i], formatting.style.routines),
+    arg.complete.push({
+      label: TransformCase(displayNames[i], arg.formatting.style.routines),
       kind: CompletionItemKind.Function,
       sortText: SORT_PRIORITY.ROUTINES,
       detail: IDL_TRANSLATION.autoComplete.detail.procedure,

libs/parsing/index/src/lib/auto-complete/get-auto-complete.ts

@@ -20,7 +20,6 @@ import { GetTypeBefore } from '../helpers/get-type-before';
 import { ResolveHoverHelpLinks } from '../helpers/resolve-hover-help-links';
 import { IDLIndex } from '../idl-index.class';
 import { AddCompletionProcedureMethods } from './completion-for/add-completion-procedure-methods';
-import { AddCompletionProcedures } from './completion-for/add-completion-procedures';
 import { AddCompletionProperties } from './completion-for/add-completion-properties';
 import { AddCompletionPropertiesInStructures } from './completion-for/add-completion-properties-in-structures';
 import {
@@ -44,6 +43,7 @@ import {
   BuildKeywordCompletionItems,
   GetKeywordCompletionOptions,
 } from './completion-for/completion-keywords';
+import { BuildProcedureCompletionItems } from './completion-for/completion-procedures';
 import {
   BuildSpecialFunctionCompletionItems,
   GetSpecialFunctionCompletionOptions,
@@ -502,7 +502,12 @@ export async function GetAutoComplete(
           token?.name in PROCEDURES ||
           (isWithinStart && token?.name === TOKEN_NAMES.CALL_PROCEDURE)
         ) {
-          AddCompletionProcedures(complete, formatting);
+          BuildProcedureCompletionItems({
+            complete,
+            formatting,
+            index,
+            options: {},
+          });
         } else {
           BuildFunctionCompletionItems({
             complete,