Skip to content

Commit 81a25a8

Browse files
committed
Rename implicit project settings and deprecate old ones
For microsoft#109990
1 parent ff7cc33 commit 81a25a8

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

extensions/typescript-language-features/package.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -505,10 +505,24 @@
505505
"javascript.implicitProjectConfig.checkJs": {
506506
"type": "boolean",
507507
"default": false,
508-
"description": "%javascript.implicitProjectConfig.checkJs%",
508+
"markdownDescription": "%configuration.implicitProjectConfig.checkJs%",
509+
"markdownDeprecationMessage": "%configuration.javascript.checkJs.checkJs.deprecation%",
510+
"scope": "window"
511+
},
512+
"js/ts.implicitProjectConfig.checkJs": {
513+
"type": "boolean",
514+
"default": false,
515+
"markdownDescription": "%configuration.implicitProjectConfig.checkJs%",
509516
"scope": "window"
510517
},
511518
"javascript.implicitProjectConfig.experimentalDecorators": {
519+
"type": "boolean",
520+
"default": false,
521+
"markdownDescription": "%configuration.implicitProjectConfig.experimentalDecorators%",
522+
"markdownDeprecationMessage": "%configuration.javascript.implicitProjectConfig.experimentalDecorators.deprecation%",
523+
"scope": "window"
524+
},
525+
"js/ts.implicitProjectConfig.experimentalDecorators": {
512526
"type": "boolean",
513527
"default": false,
514528
"markdownDescription": "%configuration.implicitProjectConfig.experimentalDecorators%",

extensions/typescript-language-features/package.nls.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"typescript.restartTsServer": "Restart TS server",
4747
"typescript.selectTypeScriptVersion.title": "Select TypeScript Version...",
4848
"typescript.reportStyleChecksAsWarnings": "Report style checks as warnings.",
49-
"javascript.implicitProjectConfig.checkJs": "Enable/disable semantic checking of JavaScript files. Existing jsconfig.json or tsconfig.json files override this setting.",
5049
"typescript.npm": "Specifies the path to the npm executable used for Automatic Type Acquisition.",
5150
"typescript.check.npmIsInstalled": "Check if npm is installed for Automatic Type Acquisition.",
5251
"configuration.suggest.names": "Enable/disable including unique names from the file in JavaScript suggestions. Note that name suggestions are always disabled in JavaScript code that is semantically checked using `@ts-check` or `checkJs`.",
@@ -62,7 +61,10 @@
6261
"configuration.tsserver.maxTsServerMemory": "Set the maximum amount of memory (in MB) to allocate to the TypeScript server process",
6362
"configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) Enables project wide error reporting.",
6463
"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Default of `null` uses VS Code's locale.",
64+
"configuration.implicitProjectConfig.checkJs": "Enable/disable semantic checking of JavaScript files. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
65+
"configuration.javascript.checkJs.checkJs.deprecation": "This setting has been deprecated in favor of `#js/ts.implicitProjectConfig.checkJs#`.",
6566
"configuration.implicitProjectConfig.experimentalDecorators": "Enable/disable `experimentalDecorators` in JavaScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
67+
"configuration.javascript.checkJs.experimentalDecorators.deprecation": "This setting has been deprecated in favor of `#js/ts.implicitProjectConfig.experimentalDecorators#`.",
6668
"configuration.implicitProjectConfig.strictNullChecks": "Enable/disable [strict null checks](https://www.typescriptlang.org/tsconfig#strictNullChecks) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
6769
"configuration.implicitProjectConfig.strictFunctionTypes": "Enable/disable [strict function types](https://www.typescriptlang.org/tsconfig#strictFunctionTypes) in JavaScript and TypeScript files that are not part of a project. Existing `jsconfig.json` or `tsconfig.json` files override this setting.",
6870
"configuration.suggest.autoImports": "Enable/disable auto import suggestions.",

extensions/typescript-language-features/src/utils/configuration.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,13 @@ export class ImplicitProjectConfiguration {
6969
}
7070

7171
private static readCheckJs(configuration: vscode.WorkspaceConfiguration): boolean {
72-
return configuration.get<boolean>('javascript.implicitProjectConfig.checkJs', false);
72+
return configuration.get<boolean>('js/ts.implicitProjectConfig.checkJs')
73+
?? configuration.get<boolean>('javascript.implicitProjectConfig.checkJs', false);
7374
}
7475

7576
private static readExperimentalDecorators(configuration: vscode.WorkspaceConfiguration): boolean {
76-
return configuration.get<boolean>('javascript.implicitProjectConfig.experimentalDecorators', false);
77+
return configuration.get<boolean>('js/ts.implicitProjectConfig.experimentalDecorators')
78+
?? configuration.get<boolean>('javascript.implicitProjectConfig.experimentalDecorators', false);
7779
}
7880

7981
private static readImplicitStrictNullChecks(configuration: vscode.WorkspaceConfiguration): boolean {

0 commit comments

Comments
 (0)