Merge pull request #14 from k--kato/fix/#13

fixed #13
kasecato · Jul 10, 2016 · acf62e4 · acf62e4
2 parents 56e5d64 + 3a2f462
commit acf62e4
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,3 +19,7 @@ script:
   - npm test --silent
   - npm run-script coverage_travis
 after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
+
+language: node_js
+node_js:
+  - "6"
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "docomment",
-    "version": "0.0.6",
+    "version": "0.0.7",
     "publisher": "k--kato",
     "engines": {
-        "vscode": "^1.2.x"
+        "vscode": "^1.3.x"
     },
     "displayName": "C# XML Documentation Comments",
     "description": "Generate C# XML documentation comments for ///",
@@ -46,8 +46,8 @@
     },
     "devDependencies": {
         "typescript": "^1.8.10",
-        "vscode": "^0.11.13",
-        "tslint": "^3.11.0",
+        "vscode": "^0.11.14",
+        "tslint": "^3.13.0",
         "istanbul": "^0.4.4",
         "coveralls": "^2.11.9",
         "mocha": "^2.5.3",

diff --git a/src/Utility/StringUtil.ts b/src/Utility/StringUtil.ts
@@ -9,7 +9,20 @@ export class StringUtil {
 
     public static IsCodeBlockStart(line: string): boolean {
         if (line === null) return false;
-        return (line.indexOf('{') !== -1) || (line.indexOf(';') !== -1);
+
+        const isAttribute: boolean = line.trim().startsWith('['); // SKIP Attribute: [foo="bar"]
+        if (isAttribute) return false;
+
+        const isCodeBlockStart: boolean = (line.indexOf('{') !== -1);
+        if (isCodeBlockStart) return true;
+
+        const isInterface: boolean = (line.indexOf(';') !== -1)
+        if (isInterface) return true;
+
+        const isEndMethod: boolean = (line.trim().endsWith(')'))
+        if (isEndMethod) return true;
+
+        return isCodeBlockStart;
     }
 
     public static RemoveComment(line: string): string {

diff --git a/test/TestData/X.cs b/test/TestData/X.cs
@@ -24,5 +24,8 @@ public class Nested{} // "T:N.X.Nested"
         int Generate(int level);
         public void Save(string data, Action<AchievementSavedResponse> onComplete = null);
         Func<string, bool> FirstClassFunction(Func<bool, int> func);
+        [Route("{time}/{location}")]
+        [HttpGet]
+        public async Task<string> GetInfoForTime(string location, double time)
    }
 }
diff --git a/test/Utility/StringUtil.test.ts b/test/Utility/StringUtil.test.ts
@@ -151,6 +151,43 @@ suite('Utility.StringUtil.IsCodeBlockStart Tests', () => {
             // assert
             assert.equal(actual, true);
         });
+
+    test(`
+        Category: Black-box testing
+        Class   : Utility.StringUtil
+        Method  : IsCodeBlockStart
+        STATE   : -
+        IN      : '[Route("{time}/{location}")]'
+        OUT     : false
+    `, () => {
+            // arrange
+            const code = '[Route("{time}/{location}")]';
+
+            // act
+            const actual: boolean = StringUtil.IsCodeBlockStart(code);
+
+            // assert
+            assert.equal(actual, false);
+        });
+
+    test(`
+        Category: Black-box testing
+        Class   : Utility.StringUtil
+        Method  : IsCodeBlockStart
+        STATE   : -
+        IN      : 'public async Task<string> GetInfoForTime(string location, double time)'
+        OUT     : true
+    `, () => {
+            // arrange
+            const code = 'public async Task<string> GetInfoForTime(string location, double time)';
+
+            // act
+            const actual: boolean = StringUtil.IsCodeBlockStart(code);
+
+            // assert
+            assert.equal(actual, true);
+        });
+
 });