Removed disabledLanguges setting

ntotten · ntotten · commit 5d69543679f3 · 2021-02-13T12:45:03.000-05:00
diff --git a/README.md b/README.md
@@ -249,10 +249,6 @@ When enabled, this extension will attempt to use global npm or yarn modules if l
 
 > NOTE: This setting can have a negative performance impact, particularly on Windows when you have attached network drives. Only enable this if you must use global modules. It is recommended that you always use local modules when possible.
 
-#### prettier.disableLanguages
-
-A list of languages IDs to disable this extension on.
-
 **Note: Disabling a language enabled in a parent folder will prevent formatting instead of letting any other formatter to run**
 
 #### prettier.documentSelectors
@@ -299,7 +295,3 @@ When a `package.json` is present in your project and it contains prettier, plugi
 **Your project is configured to use an outdated version of prettier that cannot be used by this extension. Upgrade to the latest version of prettier.**
 
 You must upgrade to a newer version of prettier.
-
-```
-
-```
diff --git a/package.json b/package.json
@@ -111,7 +111,6 @@
   },
   "dependencies": {
     "find-up": "^5.0.0",
-    "ignore": "^5.1.8",
     "prettier": "^2.2.1",
     "resolve": "^1.17.0",
     "semver": "^7.3.4",
@@ -127,6 +126,7 @@
           "items": {
             "type": "string"
           },
+          "deprecationMessage": "%ext.config.disableLanguagesDeprecation%",
           "markdownDescription": "%ext.config.disableLanguages%",
           "scope": "window"
         },
diff --git a/package.nls.json b/package.nls.json
@@ -5,6 +5,7 @@
   "ext.config.bracketSpacing": "Controls the printing of spaces inside object literals",
   "ext.config.configPath": "Path to the prettier configuration file",
   "ext.config.disableLanguages": "A list of languages IDs to disable this extension on",
+  "ext.config.disableLanguagesDeprecation": "This feature is no longer supported. Instead, configure VS Code [default formatters](https://github.com/prettier/prettier-vscode#default-formatter) or use .prettierignore.",
   "ext.config.documentSelectors": "A list of [glob patterns](https://code.visualstudio.com/api/references/vscode-api#GlobPattern) to register Prettier formatter",
   "ext.config.endOfLine": "Specify the end of line used by prettier",
   "ext.config.htmlWhitespaceSensitivity": "Specify the global whitespace sensitivity for HTML files.\n Valid options:\n- `css` - Respect the default value of CSS display property.\n- `strict` - Whitespaces are considered sensitive.\n- `ignores` - Whitespaces are considered insensitive.",
diff --git a/src/PrettierEditService.ts b/src/PrettierEditService.ts
@@ -29,8 +29,12 @@ import { ModuleResolver } from "./ModuleResolver";
 import { NotificationService } from "./NotificationService";
 import { PrettierEditProvider } from "./PrettierEditProvider";
 import { FormatterStatus, StatusBar } from "./StatusBar";
-import { PrettierModule, PrettierVSCodeConfig } from "./types";
-import { getConfig, getWorkspaceRelativePath } from "./util";
+import { PrettierModule } from "./types";
+import {
+  getConfig,
+  getWorkspaceRelativePath,
+  isDefaultFormatterOrUnset,
+} from "./util";
 
 interface ISelectors {
   rangeLanguageSelector: ReadonlyArray<DocumentFilter>;
@@ -200,11 +204,9 @@ export default class PrettierEditService implements Disposable {
     }
 
     const score = languages.match(languageSelector, document);
-    const disabledLanguages: PrettierVSCodeConfig["disableLanguages"] = getConfig(
-      document.uri
-    ).disableLanguages;
+    const isFormatterEnabled = isDefaultFormatterOrUnset(document.uri);
 
-    if (disabledLanguages.includes(document.languageId)) {
+    if (!isFormatterEnabled) {
       this.statusBar.update(FormatterStatus.Disabled);
     } else if (score > 0) {
       this.statusBar.update(FormatterStatus.Ready);
@@ -231,7 +233,7 @@ export default class PrettierEditService implements Disposable {
 
     const allExtensions = await getSupportedFileExtensions(prettierInstance);
 
-    const { disableLanguages, documentSelectors } = getConfig();
+    const { documentSelectors } = getConfig();
 
     const allRangeLanguages = getRangeSupportedLanguages();
 
@@ -255,12 +257,12 @@ export default class PrettierEditService implements Disposable {
     });
 
     // Language selectors for language IDs
-    const globalLanguageSelector: DocumentFilter[] = allLanguages
-      .filter((l) => !disableLanguages.includes(l))
-      .map((l) => ({ language: l }));
-    const globalRangeLanguageSelector: DocumentFilter[] = allRangeLanguages
-      .filter((l) => !disableLanguages.includes(l))
-      .map((l) => ({ language: l }));
+    const globalLanguageSelector: DocumentFilter[] = allLanguages.map((l) => ({
+      language: l,
+    }));
+    const globalRangeLanguageSelector: DocumentFilter[] = allRangeLanguages.map(
+      (l) => ({ language: l })
+    );
 
     const languageSelector = globalLanguageSelector
       .concat(customLanguageSelectors)
@@ -303,14 +305,6 @@ export default class PrettierEditService implements Disposable {
 
     const vscodeConfig = getConfig(uri);
 
-    // This has to stay, as it allows to skip in sub workspaceFolders. Sadly noop.
-    // wf1  (with "lang") -> glob: "wf1/**"
-    // wf1/wf2  (without "lang") -> match "wf1/**"
-    if (vscodeConfig.disableLanguages.includes(languageId)) {
-      this.statusBar.update(FormatterStatus.Ignore);
-      return;
-    }
-
     try {
       const hasConfig = await this.configResolver.checkHasPrettierConfig(
         fileName
@@ -355,7 +349,7 @@ export default class PrettierEditService implements Disposable {
     if (fileName) {
       fileInfo = await prettierInstance.getFileInfo(fileName, {
         ignorePath,
-        resolveConfig: true, // Fix for 1.19 (https://prettier.io/blog/2019/11/09/1.19.0.html#api)
+        resolveConfig: true,
         withNodeModules: vscodeConfig.withNodeModules,
       });
       this.loggingService.logInfo("File Info:", fileInfo);
diff --git a/src/types.d.ts b/src/types.d.ts
@@ -26,10 +26,6 @@ interface IExtensionConfig {
    * If true will skip formatting if a prettier config isn't found.
    */
   requireConfig: boolean;
-  /**
-   * Array of language IDs to ignore
-   */
-  disableLanguages: string[];
   /**
    * If true, take into account the .editorconfig file when resolving configuration.
    */
diff --git a/src/util.ts b/src/util.ts
@@ -30,3 +30,9 @@ export function getConfig(uri?: Uri): PrettierVSCodeConfig {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return workspace.getConfiguration("prettier", uri) as any;
 }
+
+export function isDefaultFormatterOrUnset(uri?: Uri): boolean {
+  const config = workspace.getConfiguration("editor", uri);
+  const defaultFormatter = config.get("defaultFormatter");
+  return !defaultFormatter || defaultFormatter === "esbenp.prettier-vscode";
+}
diff --git a/test-fixtures/workspace/.vscode/settings.json b/test-fixtures/workspace/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
-    "prettier.disableLanguages": [
-        "javascript"
-    ],
+    "[javascript]": {
+        "editor.defaultFormatter": "vscode.typescript-language-features"
+    },
     "javascript.format.enable": true,
     "files.eol": "\n"
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1595,7 +1595,7 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.4, ignore@^5.1.8:
+ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`		`- "prettier.disableLanguages": [`
`3`		`- "javascript"`
`4`		`- ],`
	`2`	`+ "[javascript]": {`
	`3`	`+ "editor.defaultFormatter": "vscode.typescript-language-features"`
	`4`	`+ },`
`5`	`5`	`"javascript.format.enable": true,`
`6`	`6`	`"files.eol": "\n"`
`7`	`7`	`}`