From 65bdf721a022315115078841b23318eb9a7d4dac Mon Sep 17 00:00:00 2001
From: Jason Siefken <siefkenj@gmail.com>
Date: Thu, 14 Sep 2023 14:02:15 -0400
Subject: [PATCH] Import directly from @doenet/parser

---
 packages/lsp-tools/src/dast/parser.ts                        | 3 ---
 packages/lsp-tools/src/dev-site.tsx                          | 5 ++---
 .../lsp-tools/src/doenet-source-object/element-at-offset.ts  | 2 +-
 packages/lsp-tools/src/doenet-source-object/index.ts         | 2 +-
 packages/lsp-tools/src/doenet-source-object/initializers.ts  | 2 +-
 packages/lsp-tools/test/doenet-source-object.test.ts         | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 packages/lsp-tools/src/dast/parser.ts

diff --git a/packages/lsp-tools/src/dast/parser.ts b/packages/lsp-tools/src/dast/parser.ts
deleted file mode 100644
index 8489693ef..000000000
--- a/packages/lsp-tools/src/dast/parser.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Re-export things from @doenet/parser to make typescript happy.
-// Because we are re-declaring a module to augment the `ElementData` type, this re-export is needed.
-export * from "@doenet/parser";
\ No newline at end of file
diff --git a/packages/lsp-tools/src/dev-site.tsx b/packages/lsp-tools/src/dev-site.tsx
index e7dae5bf6..80a5262d9 100644
--- a/packages/lsp-tools/src/dev-site.tsx
+++ b/packages/lsp-tools/src/dev-site.tsx
@@ -6,10 +6,9 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { CodeMirror } from "@doenet/codemirror";
-import { lezerToDast, parse } from "./dast/parser";
+import { lezerToDast, parse, filterPositionInfo } from "@doenet/parser";
 import JsonView from "react18-json-view";
 import "react18-json-view/src/style.css";
-import { filterPositionInfo } from "./dast/parser";
 import { DoenetSourceObject } from "./doenet-source-object";
 import { AutoCompleter } from "./auto-completer";
 
@@ -57,7 +56,7 @@ function App() {
             { currentPos },
             sourceObj.elementAtOffset(currentPos),
             sourceObj.attributeAtOffset(currentPos),
-            completionObj.getCompletionItems(currentPos)
+            completionObj.getCompletionItems(currentPos),
         );
     }, [currentPos, doenetSource]);
 
diff --git a/packages/lsp-tools/src/doenet-source-object/element-at-offset.ts b/packages/lsp-tools/src/doenet-source-object/element-at-offset.ts
index ff5f4125e..b89701473 100644
--- a/packages/lsp-tools/src/doenet-source-object/element-at-offset.ts
+++ b/packages/lsp-tools/src/doenet-source-object/element-at-offset.ts
@@ -1,5 +1,5 @@
 import { CursorPosition, DoenetSourceObject, RowCol } from "./index";
-import { DastElement, LezerSyntaxNodeName } from "../dast/parser";
+import { DastElement, LezerSyntaxNodeName } from "@doenet/parser";
 
 /**
  * Get the element containing the position `offset`. `null` is returned if the position is not
diff --git a/packages/lsp-tools/src/doenet-source-object/index.ts b/packages/lsp-tools/src/doenet-source-object/index.ts
index 629e3da9a..1388c550b 100644
--- a/packages/lsp-tools/src/doenet-source-object/index.ts
+++ b/packages/lsp-tools/src/doenet-source-object/index.ts
@@ -4,7 +4,7 @@ import {
     DastRoot,
     LezerSyntaxNodeName,
     toXml,
-} from "../dast/parser";
+} from "@doenet/parser";
 import { SyntaxNode, TreeCursor } from "@lezer/common";
 import {
     initDast,
diff --git a/packages/lsp-tools/src/doenet-source-object/initializers.ts b/packages/lsp-tools/src/doenet-source-object/initializers.ts
index f43bca2bb..bb12deb10 100644
--- a/packages/lsp-tools/src/doenet-source-object/initializers.ts
+++ b/packages/lsp-tools/src/doenet-source-object/initializers.ts
@@ -5,7 +5,7 @@ import {
     lezerToDast,
     stringToLezer,
     visit,
-} from "../dast/parser";
+} from "@doenet/parser";
 import { TreeCursor } from "@lezer/common";
 import { DoenetSourceObject, OffsetToPositionMap } from "./index";
 
diff --git a/packages/lsp-tools/test/doenet-source-object.test.ts b/packages/lsp-tools/test/doenet-source-object.test.ts
index 7951de3ed..8c7b02dc1 100644
--- a/packages/lsp-tools/test/doenet-source-object.test.ts
+++ b/packages/lsp-tools/test/doenet-source-object.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import util from "util";
 
-import { filterPositionInfo } from "../src/dast/parser";
+import { filterPositionInfo } from "@doenet/parser";
 import { DoenetSourceObject } from "../src/doenet-source-object";
 
 const origLog = console.log;