Refactor: various refactors and code cleaning

savoirfairelinux · Oct 19, 2023 · 48c3bff · 48c3bff
1 parent b63a3e6
commit 48c3bff
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/server/src/completions/reserved-keywords.ts b/server/src/completions/reserved-keywords.ts
@@ -15,7 +15,7 @@ const BITBAKE_KEYWORDS = [
   'INHERIT'
 ]
 
-const PYTHON_VARIABLES = [
+const PYTHON_KEYWORDS = [
   'def',
   'from',
   'import',
@@ -76,6 +76,6 @@ const SHELL_KEYWORDS = [
 
 export const RESERVED_KEYWORDS = [...new Set([
   ...BITBAKE_KEYWORDS,
-  ...PYTHON_VARIABLES,
+  ...PYTHON_KEYWORDS,
   ...SHELL_KEYWORDS
 ])]
diff --git a/server/src/connectionHandlers/onCompletion.ts b/server/src/connectionHandlers/onCompletion.ts
@@ -23,7 +23,6 @@ export function onCompletionHandler (textDocumentPositionParams: TextDocumentPos
   logger.debug(`onCompletion - current word: ${word}`)
 
   const shouldComplete = analyzer.shouldProvideCompletionItems(textDocumentPositionParams.textDocument.uri, wordPosition.line, wordPosition.character)
-  logger.debug(`isString: ${shouldComplete}`)
   // Do not provide completions if it is inside a string but not inside a variable expansion
   if (!shouldComplete) {
     return []

diff --git a/server/src/server.ts b/server/src/server.ts
@@ -91,7 +91,7 @@ connection.onDidChangeWatchedFiles((change) => {
   bitBakeProjectScanner.rescanProject()
 })
 
-connection.onCompletion(onCompletionHandler.bind(this))
+connection.onCompletion(onCompletionHandler)
 
 connection.onCompletionResolve((item: CompletionItem): CompletionItem => {
   logger.debug(`onCompletionResolve: ${JSON.stringify(item)}`)

diff --git a/server/src/tree-sitter/analyzer.ts b/server/src/tree-sitter/analyzer.ts
@@ -109,7 +109,7 @@ export default class Analyzer {
     column: number
   ): boolean {
     const n = this.nodeAtPoint(uri, line, column)
-    if (n !== null && (n.type === 'string_content' || n.type === 'ERROR')) {
+    if (n?.type === 'string_content' || n?.type === 'ERROR') {
       return false
     }
     return true