Skip to content

Get tests passing with TS nightly #32

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

Merged
merged 1 commit into from
Dec 3, 2020
Merged

Get tests passing with TS nightly #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 7 additions & 15 deletions packages/tsserver-plugin/__tests__/integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ describe('tsserver plugin', () => {
offset: 12,
});

expect(completions).toEqual({
expect(completions).toMatchObject({
isGlobalCompletion: false,
isMemberCompletion: true,
isNewIdentifierLocation: false,
Expand All @@ -201,13 +201,11 @@ describe('tsserver plugin', () => {
name: 'bar',
kind: 'property',
kindModifiers: 'optional',
sortText: '1',
},
{
name: 'foo',
kind: 'property',
kindModifiers: 'optional',
sortText: '1',
},
],
});
Expand Down Expand Up @@ -244,11 +242,10 @@ describe('tsserver plugin', () => {
offset: 13,
});

expect(completions?.entries).toContainEqual({
expect(completions?.entries.find((entry) => entry.name === 'message')).toMatchObject({
kind: 'property',
kindModifiers: 'private',
name: 'message',
sortText: '0',
});

let details = await server.request(CommandTypes.CompletionDetails, {
Expand Down Expand Up @@ -285,11 +282,10 @@ describe('tsserver plugin', () => {
offset: 9,
});

expect(completions?.entries).toContainEqual({
expect(completions?.entries.find((entry) => entry.name === 'items')).toMatchObject({
kind: 'property',
kindModifiers: '',
name: 'items',
sortText: '0',
});

let details = await server.request(CommandTypes.CompletionDetails, {
Expand Down Expand Up @@ -324,11 +320,10 @@ describe('tsserver plugin', () => {
offset: 8,
});

expect(completions?.entries).toContainEqual({
expect(completions?.entries.find((entry) => entry.name === 'letter')).toMatchObject({
kind: 'parameter',
kindModifiers: '',
name: 'letter',
sortText: '0',
});

let details = await server.request(CommandTypes.CompletionDetails, {
Expand Down Expand Up @@ -363,11 +358,10 @@ describe('tsserver plugin', () => {
offset: 8,
});

expect(completions?.entries).toContainEqual({
expect(completions?.entries.find((entry) => entry.name === 'greeting')).toMatchObject({
kind: 'const',
kindModifiers: '',
name: 'greeting',
sortText: '0',
});

let details = await server.request(CommandTypes.CompletionDetails, {
Expand Down Expand Up @@ -406,11 +400,10 @@ describe('tsserver plugin', () => {
offset: 10,
});

expect(completions?.entries).toContainEqual({
expect(completions?.entries.find((entry) => entry.name === 'Greeting')).toMatchObject({
name: 'Greeting',
kind: 'class',
kindModifiers: 'export',
sortText: '5',
hasAction: true,
source: project.filePath('greeting'),
});
Expand Down Expand Up @@ -470,11 +463,10 @@ describe('tsserver plugin', () => {
offset: 10,
});

expect(completions?.entries).toContainEqual({
expect(completions?.entries.find((entry) => entry.name === 'Greeting')).toMatchObject({
name: 'Greeting',
kind: 'class',
kindModifiers: 'export',
sortText: '5',
hasAction: true,
source: project.filePath('greeting'),
});
Expand Down
21 changes: 14 additions & 7 deletions packages/tsserver-plugin/src/language-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,11 @@ export default class GlintLanguageService implements Partial<ts.LanguageService>
if (info) {
let transformedOffset = info.transformedModule.getTransformedOffset(offset);
let result = this.ls.getRenameInfo(info.transformedPath, transformedOffset, options);
this.logger.log('getRenameInfo result before', result);
if (result.canRename) {
result.triggerSpan = rewriteTextSpan(result.triggerSpan, info.transformedModule);
}
this.logger.log('getRenameInfo result before', result);
return result;
}

Expand All @@ -289,13 +291,18 @@ export default class GlintLanguageService implements Partial<ts.LanguageService>
providePrefixAndSuffixTextForRename?: boolean | undefined
): readonly ts.RenameLocation[] | undefined {
let result = this.flatMapDefinitions(fileName, offset, (fileName, offset) => {
return this.ls.findRenameLocations(
fileName,
offset,
findInStrings,
findInComments,
providePrefixAndSuffixTextForRename
);
let shouldConsiderRenaming =
isTransformedPath(fileName) || this.ls.getRenameInfo(fileName, offset).canRename;

if (shouldConsiderRenaming) {
return this.ls.findRenameLocations(
fileName,
offset,
findInStrings,
findInComments,
providePrefixAndSuffixTextForRename
);
}
});

return result
Expand Down