Refactor: Rename getGlobalDeclarationSymbols to getGlobalDeclarationS…

…ymbolsForUri
yoctoproject · May 22, 2024 · 2d50f37 · 2d50f37
1 parent 10734be
commit 2d50f37
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/server/src/__tests__/analyzer.test.ts b/server/src/__tests__/analyzer.test.ts
@@ -46,7 +46,7 @@ describe('analyze', () => {
       document: FIXTURE_DOCUMENT.DECLARATION
     })
 
-    const globalDeclarations = analyzer.getGlobalDeclarationSymbols(DUMMY_URI)
+    const globalDeclarations = analyzer.getGlobalDeclarationSymbolsForUri(DUMMY_URI)
 
     expect(globalDeclarations).toEqual(
       expect.arrayContaining([
@@ -261,7 +261,7 @@ describe('sourceIncludeFiles', () => {
     analyzer.extractIncludeFileUris(uri)
 
     const symbols = analyzer.getIncludeUrisForUri(uri).map((includeUri) => {
-      return analyzer.getGlobalDeclarationSymbols(includeUri)
+      return analyzer.getGlobalDeclarationSymbolsForUri(includeUri)
     }).flat()
 
     expect(symbols).toEqual(
@@ -334,7 +334,7 @@ describe('declarations', () => {
       uri
     })
 
-    const symbols = analyzer.getGlobalDeclarationSymbols(uri)
+    const symbols = analyzer.getGlobalDeclarationSymbolsForUri(uri)
 
     let occurances = 0
     symbols.forEach((symbol) => {

diff --git a/server/src/connectionHandlers/onCompletion.ts b/server/src/connectionHandlers/onCompletion.ts
@@ -238,7 +238,7 @@ const allCommonDirectoriesCompletionItems: CompletionItem[] = Array.from(commonD
 function getSymbolCompletionItems (word: string | null): CompletionItem[] {
   if (word !== null) {
     const uniqueSymbolSet = new Set()
-    const globalDeclarationSymbols = analyzer.getGlobalDeclarationSymbols(documentUri).filter(symbol => {
+    const globalDeclarationSymbols = analyzer.getGlobalDeclarationSymbolsForUri(documentUri).filter(symbol => {
       if (!uniqueSymbolSet.has(symbol.name)) {
         uniqueSymbolSet.add(symbol.name)
         return true
@@ -397,7 +397,7 @@ function convertExtraSymbolsToCompletionItems (uri: string): CompletionItem[] {
   logger.debug(`[onCompletion] convertSymbolsToCompletionItems: ${uri}`)
   let completionItems: CompletionItem[] = []
   analyzer.getIncludeUrisForUri(uri).map((includeUri) => {
-    return analyzer.getGlobalDeclarationSymbols(includeUri)
+    return analyzer.getGlobalDeclarationSymbolsForUri(includeUri)
   })
     .flat()
     .reduce<BitbakeSymbolInformation[]>((acc, symbol) => {

diff --git a/server/src/connectionHandlers/onDefinition.ts b/server/src/connectionHandlers/onDefinition.ts
@@ -162,10 +162,10 @@ export function getAllDefinitionSymbolsForSymbolAtPoint (uri: string, word: stri
     return []
   }
   const allDeclarationSymbols = [
-    ...analyzer.getGlobalDeclarationSymbols(uri)
+    ...analyzer.getGlobalDeclarationSymbolsForUri(uri)
   ]
   analyzer.getIncludeUrisForUri(uri)?.forEach((includeFileUri) => {
-    allDeclarationSymbols.push(...analyzer.getGlobalDeclarationSymbols(includeFileUri))
+    allDeclarationSymbols.push(...analyzer.getGlobalDeclarationSymbolsForUri(includeFileUri))
   })
 
   return allDeclarationSymbols.filter(symbol => symbol.name === word && symbol.kind === symbolAtPoint?.kind)

diff --git a/server/src/connectionHandlers/onHover.ts b/server/src/connectionHandlers/onHover.ts
@@ -28,7 +28,7 @@ export async function onHoverHandler (params: HoverParams): Promise<Hover | null
 
   // Show documentation of a bitbake variable
   // Triggers on global declaration expressions like "VAR = 'foo'" and inside variable expansion like "FOO = ${VAR}" but skip the ones like "python VAR(){}"
-  const canShowHoverDefinitionForVariableName: boolean = (analyzer.getGlobalDeclarationSymbols(textDocument.uri).some((symbol) => symbol.name === word) && analyzer.isIdentifierOfVariableAssignment(params)) || analyzer.isVariableExpansion(textDocument.uri, position.line, position.character) || analyzer.isPythonDatastoreVariable(textDocument.uri, position.line, position.character) || analyzer.isBashVariableExpansion(textDocument.uri, position.line, position.character)
+  const canShowHoverDefinitionForVariableName: boolean = (analyzer.getGlobalDeclarationSymbolsForUri(textDocument.uri).some((symbol) => symbol.name === word) && analyzer.isIdentifierOfVariableAssignment(params)) || analyzer.isVariableExpansion(textDocument.uri, position.line, position.character) || analyzer.isPythonDatastoreVariable(textDocument.uri, position.line, position.character) || analyzer.isBashVariableExpansion(textDocument.uri, position.line, position.character)
   if (canShowHoverDefinitionForVariableName) {
     const found = [
       ...bitBakeDocScanner.bitbakeVariableInfo.filter((bitbakeVariable) => !bitBakeDocScanner.yoctoVariableInfo.some(yoctoVariable => yoctoVariable.name === bitbakeVariable.name)),
@@ -121,11 +121,11 @@ export async function onHoverHandler (params: HoverParams): Promise<Hover | null
 }
 
 function getGlobalSymbolComments (uri: string, word: string, currentSymbolAtPoint: BitbakeSymbolInformation): string | null {
-  const localSymbolsWithComments = analyzer.getGlobalDeclarationSymbols(uri).filter((symbol) => symbol.name === word).filter((symbol) => symbol.commentsAbove.length > 0)
+  const localSymbolsWithComments = analyzer.getGlobalDeclarationSymbolsForUri(uri).filter((symbol) => symbol.name === word).filter((symbol) => symbol.commentsAbove.length > 0)
   const externalSymbolsWithComments: BitbakeSymbolInformation[] = []
 
   analyzer.getIncludeUrisForUri(uri).forEach((includeFileUri) => {
-    externalSymbolsWithComments.push(...analyzer.getGlobalDeclarationSymbols(includeFileUri).filter((symbol) => symbol.name === word).filter((symbol) => symbol.commentsAbove.length > 0))
+    externalSymbolsWithComments.push(...analyzer.getGlobalDeclarationSymbolsForUri(includeFileUri).filter((symbol) => symbol.name === word).filter((symbol) => symbol.commentsAbove.length > 0))
   })
   const priority = ['.bbclass', '.conf', '.inc', '.bb', '.bbappend']
 

diff --git a/server/src/tree-sitter/analyzer.ts b/server/src/tree-sitter/analyzer.ts
@@ -90,7 +90,7 @@ export default class Analyzer {
 
   public getAllSymbols (uri: string): BitbakeSymbolInformation[] {
     return [
-      ...this.getGlobalDeclarationSymbols(uri),
+      ...this.getGlobalDeclarationSymbolsForUri(uri),
       ...this.getVariableExpansionSymbols(uri),
       ...this.getPythonDatastoreVariableSymbols(uri)
     ]
@@ -185,7 +185,7 @@ export default class Analyzer {
     return { variableExpansionSymbols, pythonDatastoreVariableSymbols }
   }
 
-  public getGlobalDeclarationSymbols (uri: string): BitbakeSymbolInformation[] {
+  public getGlobalDeclarationSymbolsForUri (uri: string): BitbakeSymbolInformation[] {
     const analyzedDocument = this.uriToAnalyzedDocument[uri]
     if (analyzedDocument !== undefined) {
       const { globalDeclarations } = analyzedDocument