Merge pull request #107 from kasecato/#106/strange_indent

Fixed #106 strange indent on delimiterd comment and tab
kasecato · Jul 27, 2020 · 292e837 · 292e837
2 parents bad920a + d6590ee
commit 292e837
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * bug fix - ctrl-enter (insert line below, insert line above) in middle of line not adding `///`. See [#98](https://github.com/kasecato/vscode-docomment/issues/98).
 * bug fix - Not working activateOnEnter. See [#104](https://github.com/kasecato/vscode-docomment/issues/104).
+* bug fix - Strange tab indent. See [#106](https://github.com/kasecato/vscode-docomment/issues/106).
 
 ## 0.1.15 (July 26, 2020)
 

diff --git a/src/Domain/Lang/DocommentDomainCSharp.ts b/src/Domain/Lang/DocommentDomainCSharp.ts
@@ -203,7 +203,7 @@ export class DocommentDomainCSharp extends DocommentDomain {
         if (codeType === CodeType.Comment) {
             const indentBaseLine: string = this._vsCodeApi.ReadLineAtCurrent();
             const indent: string = StringUtil.GetIndent(code, indentBaseLine, this._config.insertSpaces, this._config.detectIdentation);
-            const indentLen: number = StringUtil.GetIndentLen(indent, this._config.insertSpaces, this._config.detectIdentation);
+            const indentLen: number = StringUtil.GetIndentLen(indent, this._config.syntax, this._config.insertSpaces, this._config.detectIdentation);
             const lineOffset = this._isInsertDocCommentLineAbove ? 0 : 1;
             const charOffset = this._isInsertDocCommentLineAbove ? 0 : -1;
             const insertPosition: Position = this._vsCodeApi.GetPosition(position.line + lineOffset, indentLen + charOffset);
@@ -226,7 +226,7 @@ export class DocommentDomainCSharp extends DocommentDomain {
         const curPosition = this._vsCodeApi.GetActivePosition();
         const indentBaseLine: string = this._vsCodeApi.ReadLineAtCurrent();
         const indent: string = StringUtil.GetIndent(code, indentBaseLine, this._config.insertSpaces, this._config.detectIdentation);
-        const indentLen: number = StringUtil.GetIndentLen(indent, this._config.insertSpaces, this._config.detectIdentation);
+        const indentLen: number = StringUtil.GetIndentLen(indent, this._config.syntax, this._config.insertSpaces, this._config.detectIdentation);
         const line = curPosition.line + SyntacticAnalysisCSharp.GetLineOffset(this._config.syntax, codeType);
         const lineOffset = this._isInsertDocCommentLineAbove ? -1 : 0;
         const character = indentLen - 1 + docomment.length;

diff --git a/src/Utility/StringUtil.ts b/src/Utility/StringUtil.ts
@@ -1,3 +1,5 @@
+import { CommentSyntax } from "../Entity/Config/Contributes/Configuration";
+
 export class StringUtil {
 
     /*-------------------------------------------------------------------------
@@ -50,7 +52,7 @@ export class StringUtil {
         }
     }
 
-    public static GetIndentLen(indent: string, insertSpaces: boolean, detectIdentation: boolean): number {
+    public static GetIndentLen(indent: string, commentSyntax: CommentSyntax, insertSpaces: boolean, detectIdentation: boolean): number {
         if (indent === null) return 0;
 
         if (detectIdentation) {
@@ -61,7 +63,8 @@ export class StringUtil {
         if (insertSpaces) {
             return indent.split(' ').length;
         } else {
-            return indent.split('\t').length;
+            const offset = commentSyntax == CommentSyntax.delimited ? 1 : 0;
+            return indent.split('\t').length + offset;
         }
     }