Fixes bug with preparser options making semantic errors not show up correctly

packages/language-support/src/parserWrapper.ts

@@ -426,13 +426,16 @@ function parseToCommand(
   if (stmt) {
     const { start, stop } = stmt;
 
-    const cypherStmt = stmt.preparsedStatement();
+    const cypherStmt = stmt.preparsedStatement()?.statement();
     if (cypherStmt) {
       // we get the original text input to preserve whitespace
+      // stripping the preparser part of it
       const inputstream = start.getInputStream();
-      const statement = inputstream.getText(start.start, stop.stop);
+      const stmtStart = cypherStmt.start;
+      const stmtStop = cypherStmt.stop;
+      const statement = inputstream.getText(stmtStart.start, stmtStop.stop);
 
-      return { type: 'cypher', statement, start, stop };
+      return { type: 'cypher', statement, start: stmtStart, stop: stmtStop };
     }
 
     if (isEmptyStatement) {

packages/language-support/src/tests/syntaxValidation/semanticValidation.test.ts

@@ -100,6 +100,51 @@ describe('Semantic validation spec', () => {
     ]);
   });
 
+  test('Semantic errors work when we also have preparser options', () => {
+    const query = `EXPLAIN MATCH (n);
+                   PROFILE MATCH (m) RETURN n`;
+
+    expect(getDiagnosticsForQuery({ query })).toEqual([
+      {
+        message:
+          'Query cannot conclude with MATCH (must be a RETURN clause, a FINISH clause, an update clause, a unit subquery call, or a procedure call with no YIELD).',
+        offsets: {
+          end: 17,
+          start: 8,
+        },
+        range: {
+          end: {
+            character: 17,
+            line: 0,
+          },
+          start: {
+            character: 8,
+            line: 0,
+          },
+        },
+        severity: 1,
+      },
+      {
+        message: 'Variable `n` not defined',
+        offsets: {
+          end: 64,
+          start: 63,
+        },
+        range: {
+          end: {
+            character: 45,
+            line: 1,
+          },
+          start: {
+            character: 44,
+            line: 1,
+          },
+        },
+        severity: 1,
+      },
+    ]);
+  });
+
   test('Surfaces notifications correctly', () => {
     const query = `
     MATCH (shadowed)