Parse source code with old parser for LSP

Doenet · Nov 30, 2023 · ef6b016 · ef6b016
1 parent 4d70a3b
commit ef6b016
Show file tree

Hide file tree

Showing 9 changed files with 464 additions and 6 deletions.
diff --git a/packages/lsp-tools/src/doenet-source-object/index.ts b/packages/lsp-tools/src/doenet-source-object/index.ts
@@ -1,6 +1,8 @@
 import {
     DastElement,
     DastFunctionMacro,
+    DastFunctionMacroV6,
+    DastMacroV6,
     DastNodes,
     DastRoot,
     LezerSyntaxNodeName,
@@ -397,19 +399,24 @@ export type OffsetToPositionMap = {
  * Returns `true` if the macro is an "old-style" macro with slashes
  * in its path.
  */
-export function isOldMacro(macro: DastMacro | DastFunctionMacro): boolean {
+export function isOldMacro(
+    macro: DastMacro | DastFunctionMacro | DastMacroV6 | DastFunctionMacroV6,
+): boolean {
+    if (!("version" in macro) || macro.version !== "0.6") {
+        return false;
+    }
     switch (macro.type) {
         case "macro": {
             if (macro.path.length !== 1) {
                 return true;
             }
-            if (macro.accessedProp) {
+            if ("accessedProp" in macro && macro.accessedProp) {
                 return isOldMacro(macro.accessedProp);
             }
             return false;
         }
         case "function": {
-            return isOldMacro(macro.macro);
+            return "macro" in macro && isOldMacro(macro.macro);
         }
     }
 }
diff --git a/packages/lsp-tools/src/doenet-source-object/initializers.ts b/packages/lsp-tools/src/doenet-source-object/initializers.ts
@@ -3,6 +3,7 @@ import {
     DastNodes,
     DastRoot,
     lezerToDast,
+    lezerToDastV6,
     stringToLezer,
     toXml,
     visit,
@@ -41,7 +42,7 @@ export function initLezerCursor(this: DoenetSourceObject): TreeCursor {
 }
 
 export function initDast(this: DoenetSourceObject) {
-    return lezerToDast(this._lezer(), this.source);
+    return lezerToDastV6(this._lezer(), this.source);
 }
 
 export function initParentMap(this: DoenetSourceObject) {

diff --git a/packages/parser/src/index.ts b/packages/parser/src/index.ts
@@ -4,5 +4,6 @@ export * from "./types";
 export { visit } from "./pretty-printer/normalize/utils/visit";
 export { toXml } from "./dast-to-xml/dast-util-to-xml";
 export { lezerToDast, stringToLezer } from "./lezer-to-dast/lezer-to-dast";
+export { lezerToDastV6 } from "./lezer-to-dast";
 export { prettyPrint } from "./pretty-printer";
 export { filterPositionInfo } from "./dast-to-xml/utils";
diff --git a/packages/parser/src/lezer-to-dast/index.ts b/packages/parser/src/lezer-to-dast/index.ts
@@ -1 +1,2 @@
 export { lezerToDast } from "./lezer-to-dast";
+export { lezerToDastV6 } from "./lezer-to-dast-v6";