Skip to content

Rename setting to enableProjectDiscovery #1525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TwitchBronBron merged 1 commit into from
Jul 3, 2025
Merged

Rename setting to enableProjectDiscovery #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/LanguageServer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,15 @@ describe('LanguageServer', () => {
await doTest([{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
excludePatterns: []
}], [{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
Expand All @@ -212,7 +212,7 @@ describe('LanguageServer', () => {
await doTest([], [{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
Expand All @@ -226,23 +226,23 @@ describe('LanguageServer', () => {
await doTest([{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
excludePatterns: []
}, {
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: s`${tempDir}/project2`,
excludePatterns: []
}], [{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
Expand All @@ -256,15 +256,15 @@ describe('LanguageServer', () => {
await doTest([{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'trace'
},
workspaceFolder: workspacePath,
excludePatterns: []
}], [{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
Expand Down Expand Up @@ -513,7 +513,7 @@ describe('LanguageServer', () => {
const workspaceSettings: BrightScriptClientConfiguration = {
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
projects: [
Expand Down Expand Up @@ -543,7 +543,7 @@ describe('LanguageServer', () => {
],
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
}
}
Expand Down Expand Up @@ -711,7 +711,7 @@ describe('LanguageServer', () => {
{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: workspacePath,
Expand Down Expand Up @@ -792,15 +792,15 @@ describe('LanguageServer', () => {
workspaceConfigs = [{
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: s`${tempDir}/flavor1`,
excludePatterns: []
}, {
languageServer: {
enableThreading: false,
enableDiscovery: true,
enableProjectDiscovery: true,
logLevel: 'info'
},
workspaceFolder: s`${tempDir}/flavor2`,
Expand Down
6 changes: 3 additions & 3 deletions src/LanguageServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class LanguageServer {
/**
* The default project discovery setting for the language server. Can be overridden by per-workspace settings
*/
public static enableDiscoveryDefault = true;
public static enableProjectDiscoveryDefault = true;
/**
* The language server protocol connection, used to send and receive all requests and responses
*/
Expand Down Expand Up @@ -433,7 +433,7 @@ export class LanguageServer {
projects: this.normalizeProjectPaths(workspaceFolder, brightscriptConfig.projects),
languageServer: {
enableThreading: brightscriptConfig.languageServer?.enableThreading ?? LanguageServer.enableThreadingDefault,
enableDiscovery: brightscriptConfig.languageServer?.enableDiscovery ?? LanguageServer.enableDiscoveryDefault,
enableProjectDiscovery: brightscriptConfig.languageServer?.enableProjectDiscovery ?? LanguageServer.enableProjectDiscoveryDefault,
logLevel: brightscriptConfig?.languageServer?.logLevel
}
};
Expand Down Expand Up @@ -823,7 +823,7 @@ export interface BrightScriptClientConfiguration {
projects?: (string | BrightScriptProjectConfiguration)[];
languageServer: {
enableThreading: boolean;
enableDiscovery: boolean;
enableProjectDiscovery: boolean;
logLevel: LogLevel | string;
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/lsp/ProjectManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ describe('ProjectManager', () => {
...workspaceSettings,
languageServer: {
...workspaceSettings.languageServer,
enableDiscovery: false
enableProjectDiscovery: false
}
}]);
expect(
Expand Down
4 changes: 2 additions & 2 deletions src/lsp/ProjectManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ export class ProjectManager {
}

//automatic discovery disabled?
if (!workspaceConfig.languageServer.enableDiscovery) {
if (!workspaceConfig.languageServer.enableProjectDiscovery) {
return [{
dir: workspaceConfig.workspaceFolder
}];
Expand Down Expand Up @@ -944,7 +944,7 @@ export interface WorkspaceConfig {
/**
* Should the language server automatically discover projects in this workspace?
*/
enableDiscovery: boolean;
enableProjectDiscovery: boolean;
/**
* The log level to use for this workspace
*/
Expand Down
2 changes: 1 addition & 1 deletion src/testHelpers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const workspaceSettings: WorkspaceConfig = {
workspaceFolder: rootDir,
languageServer: {
enableThreading: false,
enableDiscovery: true
enableProjectDiscovery: true
}
};

Expand Down