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

Include directories in completions for path mapping (#21103)

Browse Source
This commit is contained in:
Andy
2018-01-09 13:15:30 -08:00
committed by GitHub
parent fed34cd616
commit 9aa99b90c7
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/pathCompletions.ts
View File

@@ -94,7 +94,7 @@ namespace ts.Completions.PathCompletions {
*
* both foo.ts and foo.tsx become foo
*/
const foundFiles = createMap<boolean>();
const foundFiles = createMap<true>();
for (let filePath of files) {
filePath = normalizePath(filePath);
if (exclude && comparePaths(filePath, exclude, scriptPath, ignoreCase) === Comparison.EqualTo) {
@@ -103,7 +103,7 @@ namespace ts.Completions.PathCompletions {
const foundFileName = includeExtensions ? getBaseFileName(filePath) : removeFileExtension(getBaseFileName(filePath));
if (!foundFiles.get(foundFileName)) {
if (!foundFiles.has(foundFileName)) {
foundFiles.set(foundFileName, true);
}
}
@@ -226,8 +226,9 @@ namespace ts.Completions.PathCompletions {
const includeGlob = normalizedSuffix ? "**/*" : "./*";
const matches = tryReadDirectory(host, baseDirectory, fileExtensions, /*exclude*/ undefined, [includeGlob]);
const directories = tryGetDirectories(host, baseDirectory);
// Trim away prefix and suffix
return mapDefined(matches, match => {
return mapDefined(concatenate(matches, directories), match => {
const normalizedMatch = normalizePath(match);
if (!endsWith(normalizedMatch, normalizedSuffix) || !startsWith(normalizedMatch, completePrefix)) {
return;
@@ -468,7 +469,7 @@ namespace ts.Completions.PathCompletions {
return tryIOAndConsumeErrors(host, host.getDirectories, directoryName);
}
function tryReadDirectory(host: LanguageServiceHost, path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>): string[] {
function tryReadDirectory(host: LanguageServiceHost, path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>): string[] | undefined {
return tryIOAndConsumeErrors(host, host.readDirectory, path, extensions, exclude, include);
}