🌐 AI搜索 & 代理 主页
Skip to content

fix: call configure before completion resolve #377

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
rchl merged 3 commits into from
Jan 19, 2022
Merged

fix: call configure before completion resolve #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc532c0
fix: call configure request before completion
fikuuss Jan 17, 2022
a4b5a9c
fix: call configure before completion resolve
fikuuss Jan 17, 2022
c5865bc
fix: add test for configure before completion resolve
fikuuss Jan 18, 2022
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
55 changes: 55 additions & 0 deletions src/lsp-server.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,61 @@ describe('completion', () => {
server.didCloseTextDocument({ textDocument: doc });
}).timeout(10000);

it('resolves text edit for auto-import completion in right format', async () => {
server.didChangeConfiguration({
settings: {
typescript: {
format: {
semicolons: 'remove',
insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: false
}
}
}
});

const doc = {
uri: uri('bar.ts'),
languageId: 'typescript',
version: 1,
text: 'readFile'
};
server.didOpenTextDocument({ textDocument: doc });
const proposals = await server.completion({ textDocument: doc, position: positionAfter(doc, 'readFile') });
assert.isNotNull(proposals);
const completion = proposals!.items.find(completion => completion.label === 'readFile');
assert.isDefined(completion);
const resolvedItem = await server.completionResolve(completion!);
assert.deepEqual(resolvedItem.additionalTextEdits, [
{
newText: 'import {readFile} from "fs"\n\n',
range: {
end: {
character: 0,
line: 0
},
start: {
character: 0,
line: 0
}
}
}
]);
server.didCloseTextDocument({ textDocument: doc });
server.didChangeConfiguration({
settings: {
completions: {
completeFunctionCalls: true
},
typescript: {
format: {
semicolons: 'ignore',
insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true
}
}
}
});
}).timeout(10000);

it('resolves a snippet for method completion', async () => {
const doc = {
uri: uri('bar.ts'),
Expand Down
3 changes: 3 additions & 0 deletions src/lsp-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,9 @@ export class LspServer {

async completionResolve(item: lsp.CompletionItem): Promise<lsp.CompletionItem> {
this.logger.log('completion/resolve', item);
await this.tspClient.request(CommandTypes.Configure, {
formatOptions: this.getWorkspacePreferencesForDocument(item.data.file).format
});
const { body } = await this.interuptDiagnostics(() => this.tspClient.request(CommandTypes.CompletionDetails, item.data));
const details = body && body.length && body[0];
if (!details) {
Expand Down