Merge pull request #27 from k--kato/#25

fixed Auto-generated /// on the new line inside <summary> tag #25

Author: Keisuke KATO

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.0.11 (January 8, 2017)
+
+* bug fix - Auto-generated /// on the new line inside <summary> tag. See [#25](https://github.com/k--kato/vscode-docomment/issues/25).
+
 ## 0.0.10 (December 29, 2016)
 
 * bug fix - Parameters not correctly identified when documenting constructor which chains to a base class constructor. See [#22](https://github.com/k--kato/vscode-docomment/issues/22).

README.md

@@ -32,7 +32,7 @@ The menu under File > Preferences (Code > Preferences on Mac) provides entries t
 
 ## Installation
 
-1. Install Visual Studio Code 1.7.0 or higher
+1. Install Visual Studio Code 1.8.0 or higher
 1. Launch Code
 1. From the extension view `Ctrl`-`Shift`-`X` (Windows, Linux) or `Cmd`-`Shift`-`X` (macOS)
 1. Search and Choose the extension `C# XML Documentation Comments`

package.json

@@ -1,6 +1,6 @@
 {
     "name": "docomment",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "publisher": "k--kato",
     "engines": {
         "vscode": "^1.8.0"
@@ -47,13 +47,13 @@
     "devDependencies": {
         "typescript": "^2.1.4",
         "vscode": "^1.0.3",
-        "tslint": "^4.2.0",
+        "tslint": "^4.3.1",
         "istanbul": "^0.4.5",
         "coveralls": "^2.11.15",
         "mocha": "^3.2.0",
         "mocha-lcov-reporter": "^1.2.0",
-        "@types/node": "^6.0.54",
-        "@types/mocha": "^2.2.35"
+        "@types/node": "^6.0.58",
+        "@types/mocha": "^2.2.36"
     },
     "extensionDependencies": [
     ],

src/SyntacticAnalysis/SyntacticAnalysisCSharp.ts

@@ -22,7 +22,7 @@ export class SyntacticAnalysisCSharp {
     }
 
     public static IsDocComment(activeLine: string): boolean {
-        return activeLine.match(/^\s*?\/{3}\s*$/) !== null;
+        return activeLine.match(/\/{3}/) !== null;
     }
 
     public static IsDoubleDocComment(activeLine: string): boolean {

src/Utility/StringUtil.ts

@@ -22,6 +22,9 @@ export class StringUtil {
         const isEndMethod: boolean = (line.trim().endsWith(')'))
         if (isEndMethod) return true;
 
+        const isXml: boolean = (line.indexOf('</') !== -1);
+        if (isXml) return true;
+
         return isCodeBlockStart;
     }
 

test/SyntacticAnalysis/SyntacticAnalysisCSharp.test.ts

@@ -216,14 +216,5 @@ suite('SyntacticAnalysis.SyntacticAnalysisCSharp.IsClass Tests', () => {
             assert.equal(SyntacticAnalysisCSharp.IsDocComment('///'), true, '///');
             assert.equal(SyntacticAnalysisCSharp.IsDocComment(' ///'), true, ' ///');
             assert.equal(SyntacticAnalysisCSharp.IsDocComment(' /// '), true, ' /// ');
-
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment('/// ///'), false, '/// ///');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment(' /// ///'), false, ' /// ///');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment('//////'), false, '//////');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment(' //////'), false, ' //////');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment(' /////'), false, ' /////');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment(' /// //'), false, ' /// //');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment(' //// ///'), false, ' //// ///');
-            assert.equal(SyntacticAnalysisCSharp.IsDocComment(' /// <bla>'), false, '\' /// <bla>\'');
         });
 });

test/TestData/.vscode/settings.json

@@ -0,0 +1,11 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    // Press the Enter key to activate a command (Default: false)
+    "docomment.activateOnEnter": false,
+    // Insert spaces when pressing Tab.
+    "editor.insertSpaces": true,
+    // The number of spaces a tab is equal to.
+    "editor.tabSize": 4,
+    // When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents.
+    "editor.detectIndentation": true
+}