fix completion and verification

Author: Kr0nox

src/features/constraintMenu/AutoCompletion.ts

@@ -233,7 +233,7 @@ export class AutoCompleteTree {
             return result;
         }
         for (const n of nodes) {
-            if (!n.word.verifyWord(tokens[index].text)) {
+            if (n.word.verifyWord(tokens[index].text).length > 0) {
                 continue;
             }
             result = result.concat(this.completeNode(n.children, tokens, index + 1));

src/features/dfdElements/AssignmentLanguage.ts

@@ -133,7 +133,7 @@ export namespace TreeBuilder {
             word: new ConstantWord("from"),
             children: [
                 {
-                    word: new InputWord(model),
+                    word: new InputListWord(model),
                     children: [],
                 },
             ],
@@ -221,17 +221,11 @@ class LabelWord implements ReplaceableAbstractWord {
                 return [];
             }
 
-            const possibleValues: WordCompletion[] = type.values.map((l) => ({
+            return type.values.map((l) => ({
                 insertText: l.text,
                 kind: monaco.languages.CompletionItemKind.Enum,
                 startOffset: parts[0].length + 1,
             }));
-            possibleValues.push({
-                insertText: "$" + type.name,
-                kind: monaco.languages.CompletionItemKind.Variable,
-                startOffset: parts[0].length + 1,
-            });
-            return possibleValues;
         }
 
         return [];
@@ -333,8 +327,20 @@ class InputListWord implements ReplaceableAbstractWord {
         this.inputWord = new InputWord(model);
     }
 
-    completionOptions(): WordCompletion[] {
-        return this.inputWord.completionOptions();
+    completionOptions(word: string): WordCompletion[] {
+        const parts = word.split(",");
+        // remove last one as we are completing that one
+        if (parts.length > 1) {
+            parts.pop();
+        }
+        const startOffset = parts.reduce((acc, part) => acc + part.length + 1, 0); // +1 for the commas
+        return this.inputWord
+            .completionOptions()
+            .filter((c) => !parts.includes(c.insertText))
+            .map((c) => ({
+                ...c,
+                startOffset: startOffset + (c.startOffset ?? 0),
+            }));
     }
 
     verifyWord(word: string): string[] {
@@ -363,13 +369,17 @@ class InputLabelWord implements ReplaceableAbstractWord {
     }
 
     completionOptions(word: string): WordCompletion[] {
-        const parts = word.split(".");
+        const parts = this.getParts(word);
         if (parts[1] === undefined) {
-            return this.inputWord.completionOptions();
-        } else if (parts.length === 2) {
+            return this.inputWord.completionOptions().map((c) => ({
+                ...c,
+                insertText: c.insertText,
+            }));
+        } else if (parts.length >= 2) {
             return this.labelWord.completionOptions(parts[1]).map((c) => ({
                 ...c,
-                insertText: parts[0] + "." + c.insertText,
+                insertText: c.insertText,
+                startOffset: (c.startOffset ?? 0) + parts[0].length + 1, // +1 for the dot
             }));
         }
         return [];

src/features/dfdElements/outputPortEditUi.ts

@@ -101,6 +101,9 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
     private port: DfdOutputPortImpl | undefined;
     private editor?: monaco.editor.IStandaloneCodeEditor;
     private tree?: ReplaceAutoCompleteTree;
+    private completionProvider?: monaco.IDisposable;
+
+    private static readonly DFD_LANGUAGE_NAME = "dfd-behavior";
 
     constructor(
         @inject(TYPES.IActionDispatcher) private actionDispatcher: ActionDispatcher,
@@ -145,15 +148,13 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
         this.validationLabel.classList.add("validation-label");
 
         // Initialize the monaco editor and setup the language for highlighting and autocomplete.
-        const dfdLanguageName = "dfd-behavior";
-        monaco.languages.register({ id: dfdLanguageName });
-        monaco.languages.setMonarchTokensProvider(dfdLanguageName, assignemntLanguageMonarchDefinition);
-        if (this.tree) {
-            monaco.languages.registerCompletionItemProvider(
-                dfdLanguageName,
-                new MonacoEditorAssignmentLanguageCompletionProvider(this.tree),
-            );
-        }
+
+        monaco.languages.register({ id: OutputPortEditUI.DFD_LANGUAGE_NAME });
+        monaco.languages.setMonarchTokensProvider(
+            OutputPortEditUI.DFD_LANGUAGE_NAME,
+            assignemntLanguageMonarchDefinition,
+        );
+        this.registerCompletionProvider();
 
         const monacoTheme = (ThemeManager?.useDarkMode ?? true) ? "vs-dark" : "vs";
         this.editor = monaco.editor.create(this.editorContainer, {
@@ -166,7 +167,7 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
             wordBasedSuggestions: "off", // Does not really work for our use case
             scrollBeyondLastLine: false, // Not needed
             theme: monacoTheme,
-            language: dfdLanguageName,
+            language: OutputPortEditUI.DFD_LANGUAGE_NAME,
         });
 
         this.configureHandlers(containerElement);
@@ -213,7 +214,9 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
         });
 
         // Run behavior validation when the behavior text changes.
-        this.editor?.onDidChangeModelContent(() => {});
+        this.editor?.onDidChangeModelContent(() => {
+            this.validateBehavior();
+        });
 
         // When the content size of the editor changes, resize the editor accordingly.
         this.editor?.onDidContentSizeChange(() => {
@@ -320,6 +323,8 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
         // Validation of loaded behavior text.
         this.validateBehavior();
 
+        this.registerCompletionProvider();
+
         // Wait for the next event loop tick to focus the port edit UI.
         // The user may have clicked more times before the show click was processed
         // (showing the UI takes some time due to finding the element in the graph, etc.).
@@ -330,6 +335,17 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
         }, 0); // 0ms => next event loop tick
     }
 
+    private registerCompletionProvider() {
+        if (!this.tree) {
+            return;
+        }
+        this.completionProvider?.dispose();
+        this.completionProvider = monaco.languages.registerCompletionItemProvider(
+            OutputPortEditUI.DFD_LANGUAGE_NAME,
+            new MonacoEditorAssignmentLanguageCompletionProvider(this.tree),
+        );
+    }
+
     /**
      * Sets the position of the UI to the position of the port that is currently edited.
      */