microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 16:34:36 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #27004 from RyanCavanaugh/noJsNewModuleCompletions

Browse Source 
Don't offer module completions in non-module JS files
This commit is contained in:
Ryan Cavanaugh
2018-09-12 08:32:14 -07:00
committed by GitHub
parent f2a1a428ea 95ba73e16b
commit 5a26747428
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/completions.ts
View File

@@ -1268,10 +1268,10 @@ namespace ts.Completions {
if (sourceFile.externalModuleIndicator) return true;
// If already using commonjs, don't introduce ES6.
if (sourceFile.commonJsModuleIndicator) return false;
// If some file is using ES6 modules, assume that it's OK to add more.
if (programContainsEs6Modules(program)) return true;
// For JS, stay on the safe side.
if (isUncheckedFile) return false;
// If some file is using ES6 modules, assume that it's OK to add more.
if (programContainsEs6Modules(program)) return true;
// If module transpilation is enabled or we're targeting es6 or above, or not emitting, OK.
return compilerOptionsIndicateEs6Modules(program.getCompilerOptions());
}