microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-07 23:08:20 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove leading directory separator from path mapping completion (#21688)

Browse Source
This commit is contained in:
Andy 2018-02-06 11:39:09 -08:00 committed by GitHub
parent 3b73ce49d7
commit cd22ea73d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/services/pathCompletions.ts
View File

@ -179,7 +179,7 @@ namespace ts.Completions.PathCompletions {
function getCompletionsForPathMapping(
path: string, patterns: ReadonlyArray<string>, fragment: string, baseUrl: string, fileExtensions: ReadonlyArray<string>, host: LanguageServiceHost,
): string[] {
): ReadonlyArray<string> {
if (!endsWith(path, "*")) {
// For a path mapping "foo": ["/x/y/z.ts"], add "foo" itself as a completion.
return !stringContains(path, "*") && startsWith(path, fragment) ? [path] : emptyArray;
@ -231,16 +231,19 @@ namespace ts.Completions.PathCompletions {
// Trim away prefix and suffix
return mapDefined(concatenate(matches, directories), match => {
const normalizedMatch = normalizePath(match);
if (!endsWith(normalizedMatch, normalizedSuffix) || !startsWith(normalizedMatch, completePrefix)) {
return;
}
const start = completePrefix.length;
const length = normalizedMatch.length - start - normalizedSuffix.length;
return removeFileExtension(normalizedMatch.substr(start, length));
const inner = withoutStartAndEnd(normalizedMatch, completePrefix, normalizedSuffix);
return inner !== undefined ? removeLeadingDirectorySeparator(removeFileExtension(inner)) : undefined;
});
}
function withoutStartAndEnd(s: string, start: string, end: string): string | undefined {
return startsWith(s, start) && endsWith(s, end) ? s.slice(start.length, s.length - end.length) : undefined;
}
function removeLeadingDirectorySeparator(path: string): string {
return path[0] === directorySeparator ? path.slice(1) : path;
}
function enumeratePotentialNonRelativeModules(fragment: string, scriptPath: string, options: CompilerOptions, typeChecker: TypeChecker, host: LanguageServiceHost): string[] {
// Check If this is a nested module
const isNestedModule = stringContains(fragment, directorySeparator);

8
tests/cases/fourslash/completionsPaths_pathMapping.ts
View File

@ -7,7 +7,8 @@
/////export const x = 0;
// @Filename: /src/a.ts
////import {} from "foo/[|/**/|]";
////import {} from "foo/[|/*0*/|]";
////import {} from "foo/dir/[|/*1*/|]";
// @Filename: /tsconfig.json
////{
@ -19,5 +20,6 @@
//// }
////}
const [replacementSpan] = test.ranges();
verify.completionsAt("", ["a", "b", "dir"].map(name => ({ name, replacementSpan })));
const [r0, r1] = test.ranges();
verify.completionsAt("0", ["a", "b", "dir"].map(name => ({ name, replacementSpan: r0 })));
verify.completionsAt("1", ["x"].map(name => ({ name, replacementSpan: r1 })));