fix bug

kasecato · Jan 3, 2016 · 20d0932 · 20d0932
1 parent 5a50aa3
commit 20d0932
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Domain/Lang/DocommentDomainCSharp.ts b/src/Domain/Lang/DocommentDomainCSharp.ts
@@ -116,6 +116,7 @@ export class DocommentDomainCSharp extends DocommentDomain {
             case CodeType.Field:
                 break;
             case CodeType.Property:
+                hasReturn = SyntacticAnalysisCSharp.HasPropertyReturn(code);
                 break;
             case CodeType.None:
                 return '';

diff --git a/src/SyntacticAnalysis/SyntacticAnalysisCSharp.ts b/src/SyntacticAnalysis/SyntacticAnalysisCSharp.ts
@@ -39,20 +39,20 @@ export class SyntacticAnalysisCSharp {
     }
 
     public static IsProperty(code: string): boolean {
-        return code.match(/\w+[^)]?\b{/) !== null;
+        return code.match(/[\w\S]+[^)]?\b\s*{/) !== null;
     }
 
     public static IsField(code: string): boolean {
         return code.match(/;[ \t]*$/) !== null;
     }
 
     public static IsMethod(code: string): boolean {
-        return code.match(/\w\s\w*\s*\(.*\)/) !== null;
+        return code.match(/[\w\S]\s+[\w\S]+\s*\(.*\)/) !== null;
     }
 
 
     public static GetMethodParamNameList(code: string): Array<string> {
-        const params: RegExpMatchArray = code.match(/\w\s\w*\s*\((.*)\)/);
+        const params: RegExpMatchArray = code.match(/[\w\S]\s+[\w\S]+\s*\((.*)\)/);
 
         const isMatched = (params === null || params.length !== 2);
         if (isMatched) return null;
@@ -69,11 +69,21 @@ export class SyntacticAnalysisCSharp {
     }
 
     public static HasMethodReturn(code: string): boolean {
-        const returns: RegExpMatchArray = code.match(/(\w+)\s\w+\s*\(.*\)/);
+        const returns: RegExpMatchArray = code.match(/([\w\S]+)\s+[\w\S]+\s*\(.*\)/);
 
         const isMatched = (returns === null || returns.length !== 2);
         if (isMatched) return false;
 
         return (returns[1].match(this.RESERVED_WORDS) === null) ? true : false;
     }
+
+    public static HasPropertyReturn(code: string): boolean {
+        const returns: RegExpMatchArray = code.match(/([\w\S]+)\s+[\w\S]+\s*\{/);
+
+        const isMatched = (returns === null || returns.length !== 2);
+        if (isMatched) return false;
+
+        return (returns[1].match(this.RESERVED_WORDS) === null) ? true : false;
+    }
+
 }