Skip to content

fix redundant workspace/configuration request #1847

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

Open
DetachHead wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −8
Open

fix redundant workspace/configuration request #1847

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
13 changes: 5 additions & 8 deletions packages/pyright-internal/src/realLanguageServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,9 @@ export abstract class RealLanguageServer extends LanguageServerBase {
}
}

const pythonAnalysisSection =
(await this.getConfiguration(workspace.rootUri, 'basedpyright.analysis')) ||
// this is undocumented, but we support the old section names for backwards compatibility with the pycharm pyright plugin
pythonSection?.analysis;
const basedpyrightSection = await this.getConfiguration(workspace.rootUri, 'basedpyright');
// this is undocumented, but we support the old section names for backwards compatibility with the pycharm pyright plugin
const pythonAnalysisSection = basedpyrightSection?.analysis || pythonSection?.analysis;
if (pythonAnalysisSection) {
const typeshedPaths = pythonAnalysisSection.typeshedPaths;
if (typeshedPaths && Array.isArray(typeshedPaths) && typeshedPaths.length > 0) {
Expand Down Expand Up @@ -258,10 +257,8 @@ export abstract class RealLanguageServer extends LanguageServerBase {
serverSettings.autoSearchPaths = true;
}

const pyrightSection =
(await this.getConfiguration(workspace.rootUri, 'basedpyright')) ||
// this is undocumented, but we support the old section names for backwards compatibility with the pycharm pyright plugin
(await this.getConfiguration(workspace.rootUri, 'pyright'));
// this is undocumented, but we support the old section names for backwards compatibility with the pycharm pyright plugin
const pyrightSection = basedpyrightSection || (await this.getConfiguration(workspace.rootUri, 'pyright'));
if (pyrightSection) {
if (pyrightSection.openFilesOnly !== undefined) {
serverSettings.openFilesOnly = !!pyrightSection.openFilesOnly;
Expand Down
Loading