Merge branch 'hotfix-v0.3.1'

eternalphane · Dec 10, 2018 · 935be47 · 935be47
2 parents 09f613e + 1ff86c6
commit 935be47
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to the "tsfmt-vscode" extension will be documented in this f
 
 ## [Unreleased]
 
+## [v0.3.1] 2018-12-10
+- Fix #1 (Typos)
+- Merge #2 (Register for tsx)
+
 ## [v0.3.0] 2018-12-09
 - Fix #1 (Add Configuration for notification)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "tsfmt-vscode",
     "displayName": "tsfmt - TypeScript Formatter",
     "description": "VSCode extension for TypeScript Formatter (tsfmt)",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "publisher": "eternalphane",
     "author": "Zongyuan Zuo <[email protected]>",
     "license": "MIT",
@@ -58,7 +58,7 @@
                         "disabled"
                     ],
                     "default": "enabled",
-                    "description": "Whether or not show notifications. This does not affect `tsfmt.logLevel`"
+                    "description": "Whether or not to show notifications. This does not affect `tsfmt.logLevel`"
                 },
                 "tsfmt.tsconfig.configPath": {
                     "type": [

diff --git a/src/configuration.ts b/src/configuration.ts
@@ -9,7 +9,7 @@ export function logLevel(): 'error' | 'warning' | 'information' {
 }
 
 export function showNotification(): boolean {
-    return workspace.getConfiguration('tsfmt').get('notification') || true;
+    return 'enabled' === workspace.getConfiguration('tsfmt').get('notification');
 }
 
 export function tsconfigConfigPath(): string | null {

diff --git a/src/extension.ts b/src/extension.ts
@@ -8,6 +8,8 @@ export function activate(context: ExtensionContext): void {
     context.subscriptions.push(
         languages.registerDocumentFormattingEditProvider('typescript', provider),
         languages.registerDocumentRangeFormattingEditProvider('typescript', provider),
+        languages.registerDocumentFormattingEditProvider('typescriptreact', provider),
+        languages.registerDocumentRangeFormattingEditProvider('typescriptreact', provider),
         MessageHelper
     );
 }

diff --git a/test_workspace/.vscode/settings.json b/test_workspace/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
     "typescript.tsdk": "node_modules\\typescript\\lib",
     "tsfmt.logLevel": "information",
+    "tsfmt.notification": "disabled",
     "tsfmt.tslint.autoFix": "enabled",
     "tsfmt.tslint.configPath": "my_tslint.json"
 }