diff --git a/CHANGELOG.md b/CHANGELOG.md index c884417..0f73068 100644 --- a/CHANGELOG.md +++ b/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" diff --git a/package.json b/package.json index 65ddd25..a0b8342 100644 --- a/package.json +++ b/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": { diff --git a/src/wiggin/codedox/EnterRules.hx b/src/wiggin/codedox/EnterRules.hx index f1867dd..57472ff 100644 --- a/src/wiggin/codedox/EnterRules.hx +++ b/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); diff --git a/test/Test.hx b/test/Test.hx index 75f3ec9..d40c8b3 100644 --- a/test/Test.hx +++ b/test/Test.hx @@ -39,7 +39,12 @@ class Test public function paramInference(foo) { - + switch (true) { + case true: // check indentation when pressing enter `case true:|` + case false: + } + if (true) + false; // check indentation when pressing enter `false;|` } private function noBraces(i:Int) return switch(i) {