diff --git a/src/services/services.ts b/src/services/services.ts index 30c6b88b1e2..e6e4f755ab3 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1834,7 +1834,7 @@ namespace ts { const fileContents = sourceFile.text; const result: TodoComment[] = []; - if (descriptors.length > 0) { + if (descriptors.length > 0 && !isNodeModulesFile(fileName)) { const regExp = getTodoCommentsRegExp(); let matchArray: RegExpExecArray; @@ -1958,6 +1958,12 @@ namespace ts { (char >= CharacterCodes.A && char <= CharacterCodes.Z) || (char >= CharacterCodes._0 && char <= CharacterCodes._9); } + + function isNodeModulesFile(path: string): boolean { + const node_modulesFolderName = "/node_modules/"; + + return path.indexOf(node_modulesFolderName) !== -1; + } } function getRenameInfo(fileName: string, position: number): RenameInfo { diff --git a/tests/cases/fourslash/todoComments18.ts b/tests/cases/fourslash/todoComments18.ts new file mode 100644 index 00000000000..ded5ad70d42 --- /dev/null +++ b/tests/cases/fourslash/todoComments18.ts @@ -0,0 +1,6 @@ +// Tests node_modules name in file still gets todos. + +// @Filename: /node_modules_todotest0.ts +//// // [|TODO|] + +verify.todoCommentsInCurrentFile(["TODO"]); \ No newline at end of file diff --git a/tests/cases/fourslash/todoComments19.ts b/tests/cases/fourslash/todoComments19.ts new file mode 100644 index 00000000000..94239ba7dc7 --- /dev/null +++ b/tests/cases/fourslash/todoComments19.ts @@ -0,0 +1,6 @@ +// Tests that todos are not found in node_modules folder. + +// @Filename: /node_modules/todotest0.ts +//// // TODO + +verify.todoCommentsInCurrentFile(["TODO"]); diff --git a/tests/cases/fourslash/todoComments20.ts b/tests/cases/fourslash/todoComments20.ts new file mode 100644 index 00000000000..cc66d278fa8 --- /dev/null +++ b/tests/cases/fourslash/todoComments20.ts @@ -0,0 +1,4 @@ +// @Filename: dir1/node_modules/todotest0.ts +//// // TODO + +verify.todoCommentsInCurrentFile(["TODO"]);