diff --git a/src/script/data/indentation/cppstyle.js b/src/script/data/indentation/cppstyle.js --- a/src/script/data/indentation/cppstyle.js +++ b/src/script/data/indentation/cppstyle.js @@ -66,7 +66,7 @@ // TBD triggerCharacters = "{}()[]<>/:;,#\\?!|&/%.@ '\"=*^"; -var debugMode = false; +var debugMode = true; //BEGIN global variables and functions var gIndentWidth = 4; @@ -569,10 +569,12 @@ { var result = -1; var prevString = document.line(line - 1); - var r = /^(\s*)(([\)\]}]?\s*)*([\)\]]\s*))?;/.exec(prevString); - if (r != null) + var regex = /^(\s*)(([\)\]}]?\s*)*([\)\]]\s*))?;/; + var r = regex.exec(prevString); + if (r !== null && r[0].length > 0) { result = Math.floor(r[1].length / 4) * 4; + dbg("tryDanglingSemi234324colonasdd_ch result='"+r[0]+"'"); } else { @@ -582,8 +584,9 @@ // params // > type;| r = /^(\s*)([>]+).*;/.exec(prevString); - if (r != null) + if (r !== null) result = Math.floor(r[1].length / 4) * 4; + dbg("tryDanglingSemicolonasdd_ch result="+result); } if (result != -1) {