Work In Progress

.vscode/launch.json

@@ -3,22 +3,23 @@
 
   "compounds": [
     {
-      "name": "Server/Client",
-      "configurations": ["Attach to Server", "Launch Extension"],
+      "name": "1 Debug All",
+      "configurations": ["Extension Launch", "Server Attach"],
       "stopAll": true
     }
   ],
   "configurations": [
     {
-      "name": "Attach to Server",
+      "name": "Server Attach",
       "port": 6009,
+      "timeout": 10000,
       "request": "attach",
       "skipFiles": ["<node_internals>/**"],
       "type": "node"
     },
     {
+      "name": "Extension Launch",
       "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-      "name": "Launch Extension",
       "outFiles": [
         "${workspaceFolder}/client/dist/**/*.js",
         "${workspaceFolder}/server/dist/**/*.js"

client/src/extension.ts

@@ -301,6 +301,9 @@ function startLanguageServer(): void {
   );
 
   langClient.start();
+  // langClient.onNotification("foo", (param: string) => {
+  //   console.log(`OnNotification: ${param}`)
+  // });
 }
 
 /**

server/src/completionHelpers.ts

@@ -122,8 +122,6 @@ export class CompletionHelper {
 
     const node = astData.nodeAtPosition({ line: pos.line, character: charPos });
 
-    // console.info(`Node: ${charPos} -> \n${JSON.stringify(node, null, 2)}\n\n`);
-
     if (node) {
       const list: string[] = ItemTree.getListFromPath(node);
 
@@ -145,14 +143,13 @@ export class CompletionHelper {
   static doOpenSpace(astData: AstReader, pos: Position): CompletionList {
     const compItems: CompletionItem[] = [];
 
-    // THIS NEEDS SOME MORE WORK TO} DETECT WHAT COMPLETION HELPER SHOULD BE CALLED
+    // THIS NEEDS SOME MORE WORK TO DETECT WHICH COMPLETION HELPER SHOULD BE CALLED
 
-    const node = astData.nodeAtPosition({ line: pos.line, character: pos.character });
-    console.log(`Open Space: ${node}`);
+    // const node = astData.nodeAtPosition({ line: pos.line, character: pos.character });
 
-    for (const tItem of ItemTree.Root) {
-      compItems.push(CompletionItem.create(tItem.item));
-    }
+    // for (const tItem of ItemTree.Root) {
+    //   compItems.push(CompletionItem.create(tItem.item));
+    // }
 
     return CompletionList.create(compItems, false);
   }

server/src/completionTree.ts

@@ -91,7 +91,7 @@ export class ItemTree {
   /**
    *
    */
-  private static NumberRange(start: number, end: number): TreeItem[] {
+  private static NumberRangeInteger(start: number, end: number): TreeItem[] {
     const tis: TreeItem[] = [];
 
     for (let i = start; i <= end; i++) {
@@ -349,15 +349,15 @@ export class ItemTree {
     new TreeItem("stroke", this.colorList),
     new TreeItem("fill", this.colorList),
     new TreeItem("fill-pattern", this.fillPattern),
-    new TreeItem("stroke-width", this.NumberRange(1, 15)),
-    new TreeItem("stroke-dash", this.NumberRange(0, 10)),
-    new TreeItem("border-radius", this.NumberRange(0, 20)),
+    new TreeItem("stroke-width", this.NumberRangeInteger(1, 15)),
+    new TreeItem("stroke-dash", this.NumberRangeInteger(0, 10)),
+    new TreeItem("border-radius", this.NumberRangeInteger(0, 20)),
     new TreeItem("shadow", this.trueFalse),
     new TreeItem("3D", this.trueFalse),
     new TreeItem("multiple", this.trueFalse),
     new TreeItem("double-border", this.trueFalse),
     new TreeItem("font", this.fonts),
-    new TreeItem("font-size", this.NumberRange(8, 100)),
+    new TreeItem("font-size", this.NumberRangeInteger(8, 100)),
     new TreeItem("font-color", this.colorList),
     new TreeItem("bold", this.trueFalse),
     new TreeItem("italic", this.trueFalse),

server/src/d2Ast.ts

@@ -12,7 +12,13 @@ import {
   PublishDiagnosticsParams,
 } from "vscode-languageserver";
 
-import { d2ExternalLink, d2Node, d2Range, d2StringAndRange } from "./dataContainers";
+import {
+  d2ExternalLink,
+  d2Ir,
+  d2Node,
+  d2Range,
+  d2StringAndRange,
+} from "./dataContainers";
 import { Position } from "vscode-languageserver-textdocument";
 import { connection } from "./server";
 
@@ -23,15 +29,19 @@ import { connection } from "./server";
 export class AstReader {
   constructor(astStr: string) {
     try {
+      // console.log(astStr);
       this.d2Info = JSON.parse(astStr);
     } catch (err) {
       connection.console.error("Possilble D2/VsCode version mismatch.");
       connection.console.error(astStr);
     }
 
+    // connection.sendNotification("foo", "bar");
+
     this.range = this.d2Info?.Ast.range;
 
     this.processNodes(this.d2Info?.Ast.nodes);
+    this.processIrFields(this.d2Info?.Ir.fields);
   }
 
   /**
@@ -40,6 +50,7 @@ export class AstReader {
   private range: d2Range;
   private d2Info: LSPAny;
   private nodes: d2Node[] = [];
+  private fields: d2Ir[] = [];
   private references: d2StringAndRange[] | undefined;
 
   /**
@@ -95,16 +106,16 @@ export class AstReader {
 
       for (const node of this.nodes) {
         // Edges
-        if (node.hasEdges) {
-          for (const edge of node.Edges) {
-            if (edge.src.edgeNode) {
-              this.references.push(edge.src.edgeNode);
-            }
-            if (edge.dst.edgeNode) {
-              this.references.push(edge.dst.edgeNode);
-            }
-          }
-        }
+        // if (node.hasEdges) {
+        //   for (const edge of node.Edges) {
+        //     if (edge.src.edgeNode) {
+        //       this.references.push(edge.src.edgeNode);
+        //     }
+        //     if (edge.dst.edgeNode) {
+        //       this.references.push(edge.dst.edgeNode);
+        //     }
+        //   }
+        // }
 
         if (node.hasKey) {
           if (node.Key?.key) {
@@ -168,6 +179,10 @@ export class AstReader {
    */
   private processNodes(nodes: LSPAny[]) {
     for (const node of nodes ?? []) {
+      // It's a Comment, it's not quite a node
+      if (node.map_key === undefined) {
+        continue;
+      }
       const n = new d2Node(node);
       this.nodes.push(n);
 
@@ -180,6 +195,22 @@ export class AstReader {
     }
   }
 
+  /**
+   * Go through all the ir's field objects to get
+   * references.
+   */
+  processIrFields(fields: LSPAny[]) {
+    for (const field of fields ?? []) {
+      const f = new d2Ir(field);
+      this.fields.push(f);
+    }
+
+    console.log("\n---------\nIR\n----------\n");
+    for (const f of this.fields) {
+      console.log(f.toString());
+    }
+  }
+
   dump(): void {
     console.log(`\n---------\nASTREADER: ${this.range.toString()}\n---------\n`);