Addresses more pr comments

Author: ncordon

packages/language-support/src/signatureHelp.ts

@@ -140,28 +140,22 @@ export function signatureHelp(
 ): SignatureHelp {
   let result: SignatureHelp = emptyResult;
 
-  // TODO Is this check needed
-  if (caretPosition > 0) {
-    const parserResult = parserWrapper.parse(fullQuery);
-    const caret = findCaret(parserResult, caretPosition);
-
-    if (caret) {
-      const statement = caret.statement;
-
-      const signatureHelper = new SignatureHelper(
-        statement.tokens,
-        caret.token,
-      );
-
-      ParseTreeWalker.DEFAULT.walk(signatureHelper, statement.ctx);
-      const method = signatureHelper.result;
-
-      if (method !== undefined) {
-        if (method.methodType === MethodType.function) {
-          result = toSignatureHelp(dbSchema.functionSignatures, method);
-        } else {
-          result = toSignatureHelp(dbSchema.procedureSignatures, method);
-        }
+  const parserResult = parserWrapper.parse(fullQuery);
+  const caret = findCaret(parserResult, caretPosition);
+
+  if (caret) {
+    const statement = caret.statement;
+
+    const signatureHelper = new SignatureHelper(statement.tokens, caret.token);
+
+    ParseTreeWalker.DEFAULT.walk(signatureHelper, statement.ctx);
+    const method = signatureHelper.result;
+
+    if (method !== undefined) {
+      if (method.methodType === MethodType.function) {
+        result = toSignatureHelp(dbSchema.functionSignatures, method);
+      } else {
+        result = toSignatureHelp(dbSchema.procedureSignatures, method);
       }
     }
   }

packages/language-support/src/syntaxValidation/syntaxValidation.ts

@@ -198,20 +198,21 @@ export function validateSemantics(query: string): SyntaxDiagnostic[] {
     const cachedParse = parserWrapper.parse(query);
     const statements = cachedParse.statementsParsing;
     const semanticErrors = statements.flatMap((current) => {
-      const cmd = current.command;
-      if (cmd.type === 'cypher' && cmd.statement.length > 0) {
-        const { notifications, errors } = wrappedSemanticAnalysis(
-          cmd.statement,
-        );
-
-        const elements = notifications.concat(errors);
-        const result = fixSemanticAnalysisPositions({
-          semanticElements: elements,
-          parseResult: current,
-        }).sort(sortByPosition);
-        return result;
+      if (current.diagnostics.length === 0) {
+        const cmd = current.command;
+        if (cmd.type === 'cypher' && cmd.statement.length > 0) {
+          const { notifications, errors } = wrappedSemanticAnalysis(
+            cmd.statement,
+          );
+
+          const elements = notifications.concat(errors);
+          const result = fixSemanticAnalysisPositions({
+            semanticElements: elements,
+            parseResult: current,
+          }).sort(sortByPosition);
+          return result;
+        }
       }
-
       return [];
     });