replicate vshaxe onEnterRules since codedox overwrites them

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Codedox change log
 
+## 1.3.1
+
+* replicate vshaxe onEnter rules as codedox overwrites them
+
 ## 1.3.0
 
 * Update hxnodejs and node.js to fix warning "requires node.js version 4.0.0 or higher"

package.json

@@ -2,7 +2,7 @@
 	"name": "codedox",
 	"displayname": "Codedox for Haxe",
 	"description": "JSDoc-style comments for Haxe. @param and @return tags, plus customizable file header license and copyright comments.",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"publisher": "wiggin77",
 	"license": "(MIT) View license in LICENSE.md",
 	"engines": {

src/wiggin/codedox/EnterRules.hx

@@ -80,8 +80,15 @@ class EnterRules
 				// beforeText: ^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$
 				beforeText: new RegExp("^(\\t|(\\ \\ ))*\\ \\*[^/]*\\*\\/\\s*$"),
 				action: { indentAction: vscode.IndentAction.None, removeText: 1 }
-			}
-#end					
+			},
+#end				
+			{
+				// from vshaxe; we overwrite any vshaxe rules so any not already handled above
+				// need to be replicated here.
+				beforeText: new RegExp("^\\s*(\\bcase\\s.+:|\\bdefault:)\\s*$"),
+				afterText: new RegExp("^(?!\\s*(\\bcase\\b|\\bdefault\\b))"),
+				action: {indentAction: vscode.IndentAction.Indent},
+			}	
 		];
 		CodeDox.log("onEnter rules for " + settings.strLanguage + ":");
 		CodeDox.log(onEnterRules);

test/Test.hx

@@ -39,7 +39,12 @@ class Test
 
 	public function paramInference(foo)
 	{ 
-
+		switch (true) {
+			case true:  // check indentation when pressing enter `case true:|<enter>`
+			case false:
+		}
+		if (true)
+			false;  // check indentation when pressing enter `false;|<enter>`
 	}
 
 	private function noBraces(i:Int) return switch(i) {