Experimental Indent settings still buggy.

README.md

@@ -21,7 +21,14 @@ Although you can just use it as it is there is the possibility to configure some
 
   // The delay in ms until the editor gets updated.
   "indentRainbow.updateDelay": 100 // 10 makes it super fast but may cost more resources
+```
+
+*Notice: Defining both `includedLanguages` and `excludedLanguages` does not make much sense. Use one of both!*
+
 
+The following is experimental and still buggy (do not use it :)
+
+```
   // Automatically change indent setting (tabSize / insertSpaces) for a language.
   "indentRainbow.indentSetter": {} // do nothing as default
 
@@ -35,8 +42,6 @@ Although you can just use it as it is there is the possibility to configure some
 
 ```
 
-*Notice: Defining both `includedLanguages` and `excludedLanguages` does not make much sense. Use one of both!*
-
 Build with:
 
 ```

extension.ts

@@ -29,18 +29,30 @@ export function activate(context: vscode.ExtensionContext) {
 
   var activeEditor = vscode.window.activeTextEditor;
 
+  if(activeEditor) {
+    indentConfig()
+  }
+
   if (activeEditor && checkLanguage()) {
     triggerUpdateDecorations();
   }
 
   vscode.window.onDidChangeActiveTextEditor(editor => {
     activeEditor = editor;
+    if (editor) {
+      indentConfig()
+    }
+
     if (editor && checkLanguage()) {
       triggerUpdateDecorations();
     }
   }, null, context.subscriptions);
 
   vscode.workspace.onDidChangeTextDocument(event => {
+    if(activeEditor) {
+      indentConfig()
+    }
+
     if (activeEditor && event.document === activeEditor.document && checkLanguage()) {
       triggerUpdateDecorations();
     }
@@ -49,20 +61,16 @@ export function activate(context: vscode.ExtensionContext) {
   function indentConfig() {
     // Set tabSize and insertSpaces from the config if specified for this languageId
     var indentSetter = vscode.workspace.getConfiguration('indentRainbow')['indentSetter'] || {};
-    var langCfg = indentSetter[ activeEditor.document.languageId ];
-
     // we do nothing if we have {} to not interrupt other extensions for indent settings
     if( indentSetter != {} ) {
+      var langCfg = indentSetter[ activeEditor.document.languageId ];
       if( langCfg == undefined ) {
         // if we do not have any defaults get those from the editor config itself
         langCfg = vscode.workspace.getConfiguration('editor');
       }
-      var opts = vscode.window.activeTextEditor.options;
-      if( opts.tabSize != langCfg.tabSize || opts.insertSpaces != langCfg.insertSpaces) {
-        vscode.window.activeTextEditor.options = {
-          "tabSize": langCfg.tabSize,
-          "insertSpaces": langCfg.insertSpaces
-        }
+      vscode.window.activeTextEditor.options = {
+        "tabSize": langCfg.tabSize,
+        "insertSpaces": langCfg.insertSpaces
       }
     }
   }
@@ -73,8 +81,6 @@ export function activate(context: vscode.ExtensionContext) {
         var inclang = vscode.workspace.getConfiguration('indentRainbow')['includedLanguages'] || [];
         var exclang = vscode.workspace.getConfiguration('indentRainbow')['excludedLanguages'] || [];
 
-        indentConfig();
-
         currentLanguageId = activeEditor.document.languageId;
         doIt = true;
         if(inclang.length != 0) {
@@ -102,6 +108,8 @@ export function activate(context: vscode.ExtensionContext) {
       clearMe = false;
     }
 
+    indentConfig();
+
     return doIt;
   }
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "indent-rainbow",
 	"description": "Makes indentation easier to read",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"publisher": "oderwat",
   "author": {
     "name": "Hans Raaf"