@malloydata/malloy 0.0.11 → 0.0.12-dev221204204332

package/dist/lang/parse-malloy.js

@@ -49,6 +49,18 @@ const document_highlight_walker_1 = require("./parse-tree-walkers/document-highl
 const document_completion_walker_1 = require("./parse-tree-walkers/document-completion-walker");
 const document_help_context_walker_1 = require("./parse-tree-walkers/document-help-context-walker");
 const reference_list_1 = require("./reference-list");
+/**
+ * This ignores a -> popMode when the mode stack is empty, which is a hack,
+ * but it let's us parse }%
+ */
+class HandlesOverpoppingLexer extends MalloyLexer_1.MalloyLexer {
+    popMode() {
+        if (this._modeStack.isEmpty) {
+            return this._mode;
+        }
+        return super.popMode();
+    }
+}
 class MalloyParserErrorHandler {
     constructor(translator, messages) {
         this.translator = translator;
@@ -105,7 +117,16 @@ class ParseStep {
         }
         const source = srcEnt.value == "" ? "\n" : srcEnt.value;
         this.sourceInfo = this.getSourceInfo(source);
-        const parse = this.runParser(source, that);
+        let parse;
+        try {
+            parse = this.runParser(source, that);
+        }
+        catch (parseException) {
+            that.root.logger.log({
+                message: `Malloy internal parser exception [${parseException.message}]`,
+            });
+            parse = undefined;
+        }
         if (that.root.logger.hasErrors()) {
             this.response = {
                 parse,
@@ -154,7 +175,7 @@ class ParseStep {
     }
     runParser(source, that) {
         const inputStream = antlr4ts_1.CharStreams.fromString(source);
-        const lexer = new MalloyLexer_1.MalloyLexer(inputStream);
+        const lexer = new HandlesOverpoppingLexer(inputStream);
         const tokenStream = new antlr4ts_1.CommonTokenStream(lexer);
         const malloyParser = new MalloyParser_1.MalloyParser(tokenStream);
         malloyParser.removeErrorListeners();

package/dist/lang/test/parse.spec.js

@@ -1260,6 +1260,9 @@ describe("error handling", () => {
       }
     }
     `));
+    test("popping out of embedding when not embedded", () => {
+        expect("}%").compileToFailWith("extraneous input '}%' expecting {<EOF>, EXPLORE, QUERY, SOURCE, SQL, IMPORT, ';'}");
+    });
 });
 function getSelectOneStruct(sqlBlock) {
     const selectThis = sqlBlock.select[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.11",
+  "version": "0.0.12-dev221204204332",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",