Skip to content

Commit

Permalink
Fix: Remove unnecessary extensionPath
Browse files Browse the repository at this point in the history
  • Loading branch information
Freed-Wu committed Mar 18, 2024
1 parent 26931cb commit b702b43
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 0 additions & 3 deletions client/src/language/languageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ export async function activateLanguageServer (context: ExtensionContext, bitBake
// Register the server for bitbake documents
// TODO: check new documentSelector
documentSelector: [{ scheme: 'file', language: 'bitbake' }],
initializationOptions: {
extensionPath: context.extensionPath
},
middleware: {
provideCompletionItem: middlewareProvideCompletion,
provideDefinition: middlewareProvideDefinition,
Expand Down
4 changes: 1 addition & 3 deletions server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ connection.onInitialize(async (params: InitializeParams): Promise<InitializeResu

workspaceFolder = params.workspaceFolders?.[0].uri.replace('file://', '')

// If the language server is not started by VSCode, extensionPath and pathToBitbakeFolder can be undefined
// We provide alternatives here to prevent crashes when these variables are used
const extensionPath = params.initializationOptions?.extensionPath ?? path.join(__dirname, '..')
const extensionPath = path.join(__dirname, '..')
pokyFolder = pokyFolder ?? workspaceFolder

logger.info('[onInitialize] Setting yocto doc path and parsing doc files')
Expand Down

0 comments on commit b702b43

Please sign in to comment.