Skip to content

Commit

Permalink
Team reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
Kartik Raj committed Jul 21, 2022
1 parent be3caa9 commit f97a242
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -587,18 +587,18 @@
"scope": "resource",
"type": "string"
},
"python.interpreter.displayInfo": {
"default": "pythonContext",
"description": "%python.interpreter.displayInfo.description%",
"python.interpreter.infoVisibility": {
"default": "onPythonRelated",
"description": "%python.interpreter.infoVisibility.description%",
"enum": [
"never",
"pythonContext",
"onPythonRelated",
"always"
],
"enumDescriptions": [
"%python.interpreter.displayInfo.never.description%",
"%python.interpreter.displayInfo.pythonContext.description%",
"%python.interpreter.displayInfo.always.description%"
"%python.interpreter.infoVisibility.never.description%",
"%python.interpreter.infoVisibility.onPythonRelated.description%",
"%python.interpreter.infoVisibility.always.description%"
],
"scope": "machine",
"type": "string"
Expand Down
8 changes: 4 additions & 4 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"python.linting.flake8Enabled.description": "Whether to lint Python files using flake8.",
"python.linting.flake8Path.description": "Path to flake8, you can use a custom version of flake8 by modifying this setting to include the full path.",
"python.linting.ignorePatterns.description": "Patterns used to exclude files or folders from being linted.",
"python.interpreter.displayInfo.description": "Controls when to display information of selected interpreter in the status bar.",
"python.interpreter.displayInfo.never.description": "Never display information of selected interpreter in the status bar.",
"python.interpreter.displayInfo.pythonContext.description": "Only display information of selected interpreter in the status bar if Python related files are opened.",
"python.interpreter.displayInfo.always.description": "Always display information of selected interpreter in the status bar.",
"python.interpreter.infoVisibility.description": "Controls when to display information of selected interpreter in the status bar.",
"python.interpreter.infoVisibility.never.description": "Never display information of selected interpreter in the status bar.",
"python.interpreter.infoVisibility.onPythonRelated.description": "Only display information of selected interpreter in the status bar if Python related files are opened.",
"python.interpreter.infoVisibility.always.description": "Always display information of selected interpreter in the status bar.",
"python.linting.lintOnSave.description": "Whether to lint Python files when saved.",
"python.linting.maxNumberOfProblems.description": "Controls the maximum number of problems produced by the server.",
"python.linting.mypyArgs.description": "Arguments passed in. Each argument is a separate item in the array.",
Expand Down
4 changes: 3 additions & 1 deletion src/client/common/configSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@ export class PythonSettings implements IPythonSettings {
const poetryPath = systemVariables.resolveAny(pythonSettings.get<string>('poetryPath'))!;
this.poetryPath = poetryPath && poetryPath.length > 0 ? getAbsolutePath(poetryPath, workspaceRoot) : poetryPath;

this.interpreter = pythonSettings.get<IInterpreterSettings>('interpreter') ?? { displayInfo: 'pythonContext' };
this.interpreter = pythonSettings.get<IInterpreterSettings>('interpreter') ?? {
infoVisibility: 'onPythonRelated',
};
// Get as a string and verify; don't just accept.
let userLS = pythonSettings.get<string>('languageServer');
userLS = systemVariables.resolveAny(userLS);
Expand Down
2 changes: 1 addition & 1 deletion src/client/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export interface IMypyCategorySeverity {
readonly note: DiagnosticSeverity;
}
export interface IInterpreterSettings {
displayInfo: 'never' | 'pythonContext' | 'always';
infoVisibility: 'never' | 'onPythonRelated' | 'always';
}

export interface ILintingSettings {
Expand Down

0 comments on commit f97a242

Please sign in to comment.