WIP: Migrate final routines, update overall next next

znorman-harris · znorman-harris · commit 6460f7c27861 · 2024-09-16T23:42:30.000-06:00
diff --git a/libs/parsing/index/src/lib/auto-complete/auto-complete-recipe.interface.ts b/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 {
+  IProcedureMethodCompletionOptions,
+  ProcedureMethodCompletion,
+} from './completion-for/completion-procedure-methods.interface';
 import {
   IProcedureCompletionOptions,
   ProcedureCompletion,
@@ -30,6 +34,10 @@ import {
   IPropertyCompletionOptions,
   PropertyCompletion,
 } from './completion-for/completion-properties.interface';
+import {
+  IPropertyInStructureCompletionOptions,
+  PropertyInStructureCompletion,
+} from './completion-for/completion-properties-in-structures.interface';
 import {
   ISpecialFunctionCompletionOptions,
   SpecialFunctionCompletion,
@@ -62,7 +70,9 @@ export type AutoCompleteType =
   | IncludeCompletion
   | KeywordCompletion
   | ProcedureCompletion
+  | ProcedureMethodCompletion
   | PropertyCompletion
+  | PropertyInStructureCompletion
   | SpecialFunctionCompletion
   | SpecialProcedureCompletion
   | StructureNameCompletion
@@ -87,8 +97,12 @@ export type AutoCompleteRecipeOptions<T extends AutoCompleteType> =
     ? IKeywordCompletionOptions
     : T extends ProcedureCompletion
     ? IProcedureCompletionOptions
+    : T extends ProcedureMethodCompletion
+    ? IProcedureMethodCompletionOptions
     : T extends PropertyCompletion
     ? IPropertyCompletionOptions
+    : T extends PropertyInStructureCompletion
+    ? IPropertyInStructureCompletionOptions
     : T extends SpecialFunctionCompletion
     ? ISpecialFunctionCompletionOptions
     : T extends SpecialProcedureCompletion
diff --git a/libs/parsing/index/src/lib/auto-complete/build-completion-items.interface.ts b/libs/parsing/index/src/lib/auto-complete/build-completion-items.interface.ts
@@ -12,8 +12,10 @@ 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 { BuildProcedureMethodCompletionItems } from './completion-for/completion-procedure-methods';
 import { BuildProcedureCompletionItems } from './completion-for/completion-procedures';
 import { BuildPropertyCompletionItems } from './completion-for/completion-properties';
+import { BuildPropertyInStructureCompletionItems } from './completion-for/completion-properties-in-structures';
 import { BuildSpecialFunctionCompletionItems } from './completion-for/completion-special-functions';
 import { BuildSpecialProcedureCompletionItems } from './completion-for/completion-special-procedures';
 import { BuildCompletionStructureNameItems } from './completion-for/completion-structure-names';
@@ -55,7 +57,9 @@ export const ALL_COMPLETION_ITEM_BUILDERS: BuildCompletionItemsLookup = {
   include: BuildIncludeCompletionItems,
   keyword: BuildKeywordCompletionItems,
   procedure: BuildProcedureCompletionItems,
+  'procedure-method': BuildProcedureMethodCompletionItems,
   property: BuildPropertyCompletionItems,
+  'property-in-structure': BuildPropertyInStructureCompletionItems,
   'special-function': BuildSpecialFunctionCompletionItems,
   'special-procedure': BuildSpecialProcedureCompletionItems,
   'structure-name': BuildCompletionStructureNameItems,
diff --git a/libs/parsing/index/src/lib/auto-complete/completion-for/completion-function-methods.ts b/libs/parsing/index/src/lib/auto-complete/completion-for/completion-function-methods.ts
@@ -25,7 +25,7 @@ const FUNCTION_METHODS = IDL_DISPLAY_NAMES[GLOBAL_TOKEN_TYPES.FUNCTION_METHOD];
 /**
  * Adds variables to our completion items
  */
-function AddCompletionFunctionMethodsForType(
+function BuildFunctionMethodCompletionItemsForType(
   arg: IFunctionMethodCompletionArg,
   type: IDLDataTypeBase<IDLTypes>
 ) {
@@ -138,6 +138,6 @@ export function BuildFunctionMethodCompletionItems(
 
   // process each type
   for (let i = 0; i < arg.options.type.length; i++) {
-    AddCompletionFunctionMethodsForType(arg, arg.options.type[i]);
+    BuildFunctionMethodCompletionItemsForType(arg, arg.options.type[i]);
   }
 }
diff --git a/libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedure-methods.interface.ts b/libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedure-methods.interface.ts
@@ -0,0 +1,24 @@
+import { IDLDataType } from '@idl/types/core';
+
+import { BuildCompletionItemsArg } from '../build-completion-items.interface';
+
+/**
+ * Auto-complete for procedure methods
+ */
+export type ProcedureMethodCompletion = 'procedure-method';
+
+/**
+ * Options for adding procedure method completion
+ */
+export interface IProcedureMethodCompletionOptions {
+  /**
+   * Data type to add types for
+   */
+  type: IDLDataType;
+}
+
+export interface IProcedureMethodCompletionArg
+  extends BuildCompletionItemsArg<ProcedureMethodCompletion> {
+  /** Current methods that we have found */
+  found?: { [key: string]: any };
+}
diff --git a/libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedure-methods.ts b/libs/parsing/index/src/lib/auto-complete/completion-for/completion-procedure-methods.ts
@@ -1,4 +1,3 @@
-import { FormatterType, IAssemblerOptions } from '@idl/assembling/config';
 import { TransformCase } from '@idl/assembling/shared';
 import { IDL_DISPLAY_NAMES } from '@idl/parsing/routines';
 import { IDL_TRANSLATION } from '@idl/translation';
@@ -10,10 +9,13 @@ import {
   IDLTypes,
   ParseIDLType,
 } from '@idl/types/core';
-import { CompletionItem, CompletionItemKind } from 'vscode-languageserver';
+import { CompletionItemKind } from 'vscode-languageserver';
 
-import { IDLIndex } from '../../idl-index.class';
 import { SORT_PRIORITY } from '../sort-priority.interface';
+import {
+  IProcedureMethodCompletionArg,
+  IProcedureMethodCompletionOptions,
+} from './completion-procedure-methods.interface';
 
 /**
  * Display names for procedure methods
@@ -24,24 +26,21 @@ const PROCEDURE_METHODS =
 /**
  * Adds variables to our completion items
  */
-function AddCompletionProcedureMethodsForType(
-  complete: CompletionItem[],
-  index: IDLIndex,
-  formatting: IAssemblerOptions<FormatterType>,
-  type: IDLDataTypeBase<IDLTypes>,
-  found: { [key: string]: any } = {}
+function BuildProcedureMethodCompletionItemsForType(
+  arg: IProcedureMethodCompletionArg,
+  type: IDLDataTypeBase<IDLTypes>
 ) {
   /**
    * If we have any type, return everything
    */
   if (type.name === IDL_TYPE_LOOKUP.ANY) {
     const displayNames = Object.values(PROCEDURE_METHODS);
     for (let i = 0; i < displayNames.length; i++) {
-      complete.push({
+      arg.complete.push({
         label: displayNames[i],
         insertText: TransformCase(
           displayNames[i].split('::')[1],
-          formatting.style.routineMethods
+          arg.formatting.style.routineMethods
         ),
         kind: CompletionItemKind.Function,
         sortText: SORT_PRIORITY.METHODS,
@@ -58,23 +57,23 @@ function AddCompletionProcedureMethodsForType(
   const keysInternal = Object.keys(PROCEDURE_METHODS);
   for (let i = 0; i < keysInternal.length; i++) {
     const methodName = keysInternal[i].split('::')[1];
-    if (keysInternal[i].startsWith(compareType) && !(methodName in found)) {
-      complete.push({
+    if (keysInternal[i].startsWith(compareType) && !(methodName in arg.found)) {
+      arg.complete.push({
         label: PROCEDURE_METHODS[keysInternal[i]],
         insertText: TransformCase(
           PROCEDURE_METHODS[keysInternal[i]].split('::')[1],
-          formatting.style.routineMethods
+          arg.formatting.style.routineMethods
         ),
         kind: CompletionItemKind.Function,
         sortText: SORT_PRIORITY.METHODS,
         detail: IDL_TRANSLATION.autoComplete.detail.procedureMethod,
       });
-      found[methodName] = true;
+      arg.found[methodName] = true;
     }
   }
 
   // check for global token
-  const global = index.findMatchingGlobalToken(
+  const global = arg.index.findMatchingGlobalToken(
     GLOBAL_TOKEN_TYPES.STRUCTURE,
     type.name.toLocaleLowerCase()
   );
@@ -83,36 +82,43 @@ function AddCompletionProcedureMethodsForType(
     const inherits = global[0].meta.inherits;
     if (inherits.length > 0) {
       for (let i = 0; i < inherits.length; i++) {
-        AddCompletionProcedureMethods(
-          complete,
-          index,
-          formatting,
-          ParseIDLType(inherits[i]),
-          found
-        );
+        BuildProcedureMethodCompletionItems({
+          ...arg,
+          ...{
+            options: {
+              type: ParseIDLType(inherits[i]),
+            },
+          },
+        });
       }
     }
   }
 }
 
+/**
+ * Creates options for creating property completion items
+ */
+export function GetProcedureMethodCompletionOptions(
+  type: IDLDataType
+): IProcedureMethodCompletionOptions {
+  return {
+    type,
+  };
+}
+
 /**
  * Adds variables to our completion items
  */
-export function AddCompletionProcedureMethods(
-  complete: CompletionItem[],
-  index: IDLIndex,
-  formatting: IAssemblerOptions<FormatterType>,
-  type: IDLDataType,
-  found: { [key: string]: any } = {}
+export function BuildProcedureMethodCompletionItems(
+  arg: IProcedureMethodCompletionArg
 ) {
+  // track found if we dont have it
+  if (!arg.found) {
+    arg.found = {};
+  }
+
   // process each type
-  for (let i = 0; i < type.length; i++) {
-    AddCompletionProcedureMethodsForType(
-      complete,
-      index,
-      formatting,
-      type[i],
-      found
-    );
+  for (let i = 0; i < arg.options.type.length; i++) {
+    BuildProcedureMethodCompletionItemsForType(arg, arg.options.type[i]);
   }
 }
diff --git a/libs/parsing/index/src/lib/auto-complete/completion-for/completion-properties-in-structures.interface.ts b/libs/parsing/index/src/lib/auto-complete/completion-for/completion-properties-in-structures.interface.ts
@@ -0,0 +1,14 @@
+/**
+ * Auto-complete for properties in structures
+ */
+export type PropertyInStructureCompletion = 'property-in-structure';
+
+/**
+ * Options for adding properties in structures
+ */
+export interface IPropertyInStructureCompletionOptions {
+  /** Structure name */
+  name: string;
+  /** Properties already specified */
+  found: { [key: string]: boolean };
+}
diff --git a/libs/parsing/index/src/lib/auto-complete/completion-for/completion-properties-in-structures.ts b/libs/parsing/index/src/lib/auto-complete/completion-for/completion-properties-in-structures.ts
@@ -11,7 +11,12 @@ import { GLOBAL_TOKEN_TYPES } from '@idl/types/core';
 import { CompletionItem, CompletionItemKind } from 'vscode-languageserver';
 
 import { IDLIndex } from '../../idl-index.class';
+import { BuildCompletionItemsArg } from '../build-completion-items.interface';
 import { SORT_PRIORITY } from '../sort-priority.interface';
+import {
+  IPropertyInStructureCompletionOptions,
+  PropertyInStructureCompletion,
+} from './completion-properties-in-structures.interface';
 
 /**
  *Recursively finds properties and adds them to our completion list if we have not
@@ -69,14 +74,11 @@ function ResolveProperties(
 }
 
 /**
- * Adds keyword completion properties inside of structures
+ * Get options to do auto-complete in structures
  */
-export function AddCompletionPropertiesInStructures(
-  complete: CompletionItem[],
-  index: IDLIndex,
-  token: TreeToken<StructureNameToken>,
-  formatting: IAssemblerOptions<FormatterType>
-) {
+export function GetPropertyInStructureCompletionOptions(
+  token: TreeToken<StructureNameToken>
+): IPropertyInStructureCompletionOptions {
   // get the name of of our structure
   const name = token.match[0];
 
@@ -89,6 +91,24 @@ export function AddCompletionPropertiesInStructures(
     found[GetPropertyName(props[i]).toLowerCase()] = true;
   }
 
+  return {
+    name,
+    found,
+  };
+}
+
+/**
+ * Adds keyword completion properties inside of structures
+ */
+export function BuildPropertyInStructureCompletionItems(
+  arg: BuildCompletionItemsArg<PropertyInStructureCompletion>
+) {
   // resolve properties
-  ResolveProperties(complete, index, formatting, name, found);
+  ResolveProperties(
+    arg.complete,
+    arg.index,
+    arg.formatting,
+    arg.options.name,
+    arg.options.found
+  );
 }
diff --git a/libs/parsing/index/src/lib/auto-complete/completion-for/completion-properties.ts b/libs/parsing/index/src/lib/auto-complete/completion-for/completion-properties.ts
@@ -19,7 +19,7 @@ import {
 /**
  * Adds variables to our completion items
  */
-function AddCompletionPropertiesForType(
+function BuildPropertyCompletionItemsForType(
   arg: IPropertyCompletionArg,
   type: IDLDataTypeBase<IDLTypes>
 ) {
@@ -131,6 +131,6 @@ export function BuildPropertyCompletionItems(arg: IPropertyCompletionArg) {
 
   // process each type
   for (let i = 0; i < arg.options.type.length; i++) {
-    AddCompletionPropertiesForType(arg, arg.options.type[i]);
+    BuildPropertyCompletionItemsForType(arg, arg.options.type[i]);
   }
 }
diff --git a/libs/parsing/index/src/lib/auto-complete/get-auto-complete.ts b/libs/parsing/index/src/lib/auto-complete/get-auto-complete.ts
