Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

getScriptInfoOrConfig: Canonicalize tsconfig path before lookup #26280

Merged
merged 10 commits into from
Jan 9, 2019
Merged

getScriptInfoOrConfig: Canonicalize tsconfig path before lookup #26280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
77494d6
getScriptInfoOrConfig: Canonicalize tsconfig path before lookup
Aug 7, 2018
ac460e3
code review
Aug 10, 2018
a8bf0f7
Merge branch 'master' into tsconfig_canonicalpath
Sep 5, 2018
76ccefb
Merge branch 'master' into tsconfig_canonicalpath
Sep 17, 2018
0f5d626
Use this.toPath
Sep 17, 2018
e39f679
Merge branch 'master' into tsconfig_canonicalpath
Sep 17, 2018
076f0bb
Merge branch 'master' into tsconfig_canonicalpath
Oct 22, 2018
d29a072
Merge branch 'master' into tsconfig_canonicalpath
Nov 16, 2018
1870ee4
Merge branch 'master' into tsconfig_canonicalpath
sheetalkamat Jan 9, 2019
76c9d9f
Fix the failing test case
sheetalkamat Jan 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/server/editorServices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1804,7 +1804,7 @@ namespace ts.server {
const path = toNormalizedPath(uncheckedFileName);
const info = this.getScriptInfoForNormalizedPath(path);
if (info) return info;
const configProject = this.configuredProjects.get(uncheckedFileName);
const configProject = this.configuredProjects.get(this.toCanonicalFileName(uncheckedFileName));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is right infact you want to use 'path' here as the key I think.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like I still at least need this.toCanonicalFileName(path). The key comes from project.canonicalConfigPath which is asNormalizedPath(projectService.toCanonicalFileName(configFileName));

return configProject && configProject.getCompilerOptions().configFile;
}

Expand Down
37 changes: 37 additions & 0 deletions src/testRunner/unittests/tsserverProjectSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9717,6 +9717,43 @@ export function Test2() {
});
});

describe("tsserverProjectSystem refactors", () => {
it("handles canonicalization of tsconfig path", () => {
const aTs: File = { path: "/Foo/a.ts", content: "const x = 0;" };
const tsconfig: File = { path: "/Foo/tsconfig.json", content: '{ "files": ["./a.ts"] }' };
const session = createSession(createServerHost([aTs, tsconfig]));
openFilesForSession([aTs], session);

const result = executeSessionRequest<protocol.GetEditsForRefactorRequest, protocol.GetEditsForRefactorResponse>(session, protocol.CommandTypes.GetEditsForRefactor, {
file: aTs.path,
startLine: 1,
startOffset: 1,
endLine: 2,
endOffset: aTs.content.length,
refactor: "Move to a new file",
action: "Move to a new file",
});
assert.deepEqual<protocol.RefactorEditInfo | undefined>(result, {
edits: [
{
fileName: aTs.path,
textChanges: [{ start: { line: 1, offset: 1 }, end: { line: 1, offset: aTs.content.length + 1 }, newText: "" }],
},
{
fileName: tsconfig.path,
textChanges: [{ start: { line: 1, offset: 21 }, end: { line: 1, offset: 21 }, newText: ', "./x.ts"' }],
},
{
fileName: "/Foo/x.ts",
textChanges: [{ start: { line: 0, offset: 0 }, end: { line: 0, offset: 0 }, newText: "const x = 0;" }],
},
],
renameFilename: undefined,
renameLocation: undefined,
});
});
});

function makeReferenceItem(file: File, isDefinition: boolean, text: string, lineText: string, options?: SpanFromSubstringOptions): protocol.ReferencesResponseItem {
return {
...protocolFileSpanFromSubstring(file, text, options),
Expand Down