Skip to content

Commit

Permalink
fix: Disable caching as leads to issue wtih backspace
Browse files Browse the repository at this point in the history
  • Loading branch information
famoser committed Feb 11, 2024
1 parent 05ad9aa commit 47bac36
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 27 deletions.
11 changes: 1 addition & 10 deletions server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {rename} from "./rename";
import {getReferences} from "./references";
import {getSemanticTokens} from './semantic_token_provider';
import {getDocumentLinks} from "./document_links";
import {getActiveParameter, getSignatureHelp} from "./signature_help";
import {getSignatureHelp} from "./signature_help";

const connection = createConnection(ProposedFeatures.all);
const documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument);
Expand Down Expand Up @@ -96,15 +96,6 @@ connection.onDocumentLinks(async params => {
});

connection.onSignatureHelp(async params => {
if (params.context?.isRetrigger && params.context.activeSignatureHelp) {
const activeParameter = await getActiveParameter(params.textDocument, params.position, documentManager);
if (activeParameter === undefined) {
return undefined;
}

return { ...params.context.activeSignatureHelp, activeParameter };
}

const signatureHelp = await getSignatureHelp(params.textDocument, params.position, documentManager);
if (!signatureHelp) {
console.log("not found");
Expand Down
20 changes: 3 additions & 17 deletions server/src/signature_help.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "vscode-languageserver";
import {DocumentManagerInterface} from "./document_manager";
import {DefinitionSymbol, getDefinitionSymbolFromPosition} from "./go_to_definition";
import {getSignaturePosition} from "./parseTree/get_signature_position";
import {getSignaturePosition, SignaturePosition} from "./parseTree/get_signature_position";

export const getSignatureHelp = async (identifier: TextDocumentIdentifier, position: Position, documentManager: DocumentManagerInterface): Promise<SignatureHelp | undefined> => {
const parseResult = await documentManager.getParseResult(identifier);
Expand All @@ -35,11 +35,11 @@ export const getSignatureHelp = async (identifier: TextDocumentIdentifier, posit
const createOffsetLabels = (definitionSymbol: DefinitionSymbol) => {
const parameterLabels = (definitionSymbol.symbol.parameters ?? []).map(parameter => {
if (!parameter) {
return ""
return "";
}

const typeSuffix = parameter.type ? ": " + parameter.type.text : "";
return parameter.node.text + typeSuffix
return parameter.node.text + typeSuffix;
});


Expand All @@ -57,17 +57,3 @@ const createOffsetLabels = (definitionSymbol: DefinitionSymbol) => {
signatureLabel: `${signatureText}(${parameterLabels.join(", ")})`
};
};

export const getActiveParameter = async (identifier: TextDocumentIdentifier, position: Position, documentManager: DocumentManagerInterface): Promise<uinteger | undefined> => {
const parseResult = await documentManager.getParseResult(identifier);
if (!parseResult) {
return undefined;
}

const signaturePosition = getSignaturePosition(parseResult.parser.inputStream, position);
if (!signaturePosition) {
return undefined;
}

return signaturePosition.parameterPosition;
};

0 comments on commit 47bac36

Please sign in to comment.