Issue/52 (#56)

prestonph · web-flow · commit 807f921f7702 · 2017-03-18T15:23:24.000+08:00
* Fix incorrectly accept markers in the middle of a string (#52). * Add built packages.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.8.9
+- Fix issue 52: marker must be at the beginning of a string.
+
 ## 1.8.8
 - Fix a bug where asterisk(*) and slash(/) are removed even if they are in the middle of a string.
 
diff --git a/built_packages/vscode-todo-parser-1.8.8.vsix b/built_packages/vscode-todo-parser-1.8.8.vsix
diff --git a/built_packages/vscode-todo-parser-1.8.9.vsix b/built_packages/vscode-todo-parser-1.8.9.vsix
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-todo-parser",
   "displayName": "TODO Parser",
   "description": "Parse TODOs in your working files.",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "publisher": "minhthai",
   "engines": {
     "vscode": "^1.2.0"
diff --git a/src/utils/stringUtils.ts b/src/utils/stringUtils.ts
@@ -68,7 +68,7 @@ export function startsWithOne(str: string, prefixes: string[]): boolean {
       p = '\\b' + p;
     if (/\w/.test(p.slice(-1)))
       p = p + '\\b';
-    if ((new RegExp(p, 'i')).test(str))
+    if ((new RegExp('^' + p, 'i')).test(str))
       return true;
   }
   return false;
diff --git a/test/samples/cpp.cpp b/test/samples/cpp.cpp
@@ -8,5 +8,6 @@ int main() {
   * todo 
   */
   // NOTE: new marker
+  // Here, we look for strings containing TODO
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ export function startsWithOne(str: string, prefixes: string[]): boolean {`
`68`	`68`	`p = '\\b' + p;`
`69`	`69`	`if (/\w/.test(p.slice(-1)))`
`70`	`70`	`p = p + '\\b';`
`71`		`- if ((new RegExp(p, 'i')).test(str))`
	`71`	`+ if ((new RegExp('^' + p, 'i')).test(str))`
`72`	`72`	`return true;`
`73`	`73`	`}`
`74`	`74`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ int main() {`
`8`	`8`	`* todo`
`9`	`9`	`*/`
`10`	`10`	`// NOTE: new marker`
	`11`	`+ // Here, we look for strings containing TODO`
`11`	`12`	`return 0;`
`12`	`13`	`}`