fix selection bug

DataFlowAnalysis · Jan 15, 2025 · 9584ebf · 9584ebf
1 parent da8d15e
commit 9584ebf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/src/features/constraintMenu/AutoCompletion.ts b/src/features/constraintMenu/AutoCompletion.ts
@@ -129,6 +129,8 @@ export class AutoCompleteTree {
         if (index >= this.content.length) {
             if (nodes.length == 0 || comesFromFinal) {
                 return [];
+            } else {
+                return [{ message: "Unexpected end of line", startColumn: this.length, endColumn: this.length }];
             }
         }
 

diff --git a/src/features/constraintMenu/ConstraintMenu.ts b/src/features/constraintMenu/ConstraintMenu.ts
@@ -42,8 +42,8 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
         this.constraintRegistry = constraintRegistry;
         this.tree = new AutoCompleteTree(TreeBuilder.buildTree(modelSource, labelTypeRegistry));
         this.forceReadOnly = editorModeController?.getCurrentMode() !== "edit";
-        editorModeController?.onModeChange((mode) => {
-            this.forceReadOnly = mode !== "edit";
+        editorModeController?.onModeChange((_) => {
+            this.forceReadOnly = editorModeController!.isReadOnly();
         });
     }
 
@@ -58,7 +58,7 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
         containerElement.innerHTML = `
             <input type="checkbox" id="expand-state-constraint" class="accordion-state" hidden>
             <label id="constraint-menu-expand-label" for="expand-state-constraint">
-                <div class="accordion-button cevron-left" id="constraint-menu-expand-title">
+                <div class="accordion-button cevron-left flip-arrow" id="constraint-menu-expand-title">
                     Constraints
                 </div>
             </label>
@@ -110,6 +110,10 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
             readOnly: this.constraintRegistry.getConstraints().length === 0 || this.forceReadOnly,
         });
 
+        this.editor?.setValue(
+            this.constraintRegistry.getConstraints()[0]?.constraint ?? "Select or create a constraint to edit",
+        );
+
         this.editor?.onDidChangeModelContent(() => {
             if (this.selectedConstraint) {
                 this.selectedConstraint.constraint = this.editor?.getValue() ?? "";
@@ -189,20 +193,21 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
 
         const deleteButton = document.createElement("button");
         deleteButton.innerHTML = '<span class="codicon codicon-trash"></span>';
-        deleteButton.onclick = () => {
-            this.constraintRegistry.unregisterConstraint(constraint);
-            this.rerenderConstraintList();
-            if (this.selectedConstraint === constraint) {
+        deleteButton.onclick = (e) => {
+            e.stopPropagation();
+            if (this.selectedConstraint?.id === constraint.id) {
                 this.selectConstraintListItem(undefined);
             }
+            this.constraintRegistry.unregisterConstraint(constraint);
+            this.rerenderConstraintList();
         };
         valueElement.appendChild(deleteButton);
         return valueElement;
     }
 
     private selectConstraintListItem(constraint?: Constraint): void {
         this.selectedConstraint = constraint;
-        this.editor?.setValue(constraint?.constraint ?? "");
+        this.editor?.setValue(constraint?.constraint ?? "Select or create a constraint to edit");
         this.editor?.updateOptions({ readOnly: constraint === undefined || this.forceReadOnly });
     }
 
@@ -220,9 +225,9 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
         addButton.classList.add("constraint-add");
         addButton.innerHTML = '<span class="codicon codicon-add"></span> Constraint';
         addButton.onclick = () => {
-            /*if (this.editorModeController?.isReadOnly()) {
+            if (this.forceReadOnly) {
                 return;
-            }*/
+            }
             if (!list) {
                 return;
             }

diff --git a/src/features/constraintMenu/constraintMenu.css b/src/features/constraintMenu/constraintMenu.css
@@ -60,10 +60,6 @@ div.constraint-menu {
     grid-column-start: 2;
 }
 
-#constraint-menu-expand-label {
-    /*padding-right: 2em;*/
-}
-
 .constrain-label input {
     background-color: var(--color-background);
     text-align: center;