update caret position

Author: XuechunHHH

server/aws-lsp-partiql/src/server/completion-hint/parser-completion.ts

@@ -52,11 +52,6 @@ function symbolAtCaretPosition(parseTree: TerminalNode, caretPosition: { line: n
     const start = parseTree.symbol.column
     const stop = start + (parseTree.symbol.text?.length ?? 0)
 
-    console.log(
-        `Checking symbol: ${parseTree.symbol.text}, Line: ${parseTree.symbol.line}, Start: ${start}, Stop: ${stop}`
-    )
-    console.log(`Caret POsition: Line: ${caretPosition.line + 1}, character: ${caretPosition.character}`)
-
     return (
         parseTree.symbol.line == caretPosition.line + 1 &&
         start <= caretPosition.character &&
@@ -69,7 +64,6 @@ function computeTokenIndexOfTerminalNode(
     caretPosition: { line: number; character: number }
 ): number | undefined {
     if (symbolAtCaretPosition(parseTree, caretPosition)) {
-        console.log(`Token index found: ${parseTree.symbol.tokenIndex} for symbol: ${parseTree.symbol.text}`)
         return parseTree.symbol.tokenIndex
     } else {
         return undefined
@@ -83,10 +77,8 @@ function computeTokenIndexOfChildNode(
     for (let i = 0; i < parseTree.getChildCount(); i++) {
         const child = parseTree.getChild(i)
         if (child != null) {
-            console.log(`Visiting child node at index: ${i}`)
             const index = computeTokenIndex(child, caretPosition)
             if (index !== undefined) {
-                console.log(`Index found in child: ${index}`)
                 return index
             }
         }
@@ -98,7 +90,6 @@ function computeTokenIndex(
     parseTree: ParseTree,
     caretPosition: { line: number; character: number }
 ): number | undefined {
-    console.log(`Current parseTree node type: ${parseTree.constructor.name}`)
     if (parseTree instanceof TerminalNode) {
         return computeTokenIndexOfTerminalNode(parseTree, caretPosition)
     } else {
@@ -118,13 +109,27 @@ function getCandidates(parser: PartiQLParser, index: number) {
 
     // Add rules
     core.preferredRules = new Set([
-        // PartiQLParser.RULE_qualifiedName,
+        // No rules specified for now
     ])
     return core.collectCandidates(index)
 }
 
+function getPosition(
+    content: string,
+    position: { line: number; character: number }
+): { line: number; character: number } {
+    const lines = content.split('\n')
+    const line = lines[position.line]
+    const substring = line.substring(0, position.character)
+    const lastSpaceIndex = substring.lastIndexOf(' ')
+    return {
+        line: position.line,
+        character: lastSpaceIndex + 1,
+    }
+}
+
 export function getSuggestions(content: string, position: { line: number; character: number }): CompletionList | null {
-    console.log(`Getting suggestions for content: ${content}, position: ${position.line + 1}:${position.character}`)
+    position = getPosition(content, position)
     const parser = initializePartiQLParser(content)
     const tokenIndex = getTokenIndexFromParseTree(parser, position)
     const candidates = getCandidates(parser, tokenIndex)