Improve error handling for conflicts with "haxe.enableExtendedIndenta…

…tion" see #410
vshaxe · Jun 10, 2020 · e544bd0 · e544bd0
1 parent a6232e1
commit e544bd0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 2.20.3 (to be released)
+
+**Changes and Improvements:**
+
+- improved error handling for conflicts with `"haxe.enableExtendedIndentation"` ([#410](https://github.com/vshaxe/vshaxe/issues/410))
+
 ### 2.20.2 (June 7, 2020)
 
 **Changes and Improvements:**

diff --git a/src/vshaxe/AutoIndentation.hx b/src/vshaxe/AutoIndentation.hx
@@ -54,8 +54,13 @@ class AutoIndentation {
 			return;
 		}
 		if (enabled) {
-			typeDisposable = commands.registerCommand("type", type);
-			context.subscriptions.push(typeDisposable);
+			try {
+				typeDisposable = commands.registerCommand("type", type);
+				context.subscriptions.push(typeDisposable);
+			} catch (e) {
+				window.showErrorMessage("Failed to register the 'type' command needed for the \"haxe.enableExtendedIndentation\" setting"
+					+ " - there is probably a conflict with another extension such as Vim.");
+			}
 		} else {
 			if (typeDisposable != null) {
 				typeDisposable.dispose();