Skip to content

Inlay hints Provider v2 #199

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 6 commits into from
Mar 31, 2022
Merged

Inlay hints Provider v2 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30de683
Use VSCode inlay hints provider
adam-fowler Mar 10, 2022
7a3ee1d
Fixed passing of Range
adam-fowler Mar 10, 2022
2e637d8
comments
adam-fowler Mar 10, 2022
6e433e1
Check config to see if InlayHints should be rendered
adam-fowler Mar 10, 2022
044beed
Make sure we have the v1.65.0 types
adam-fowler Mar 14, 2022
2d9d941
Update package-lock.json
adam-fowler Mar 23, 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
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"url": "https://github.com/swift-server/vscode-swift"
},
"engines": {
"vscode": "^1.62.0"
"vscode": "^1.65.0"
},
"categories": [
"Programming Languages"
Expand Down Expand Up @@ -143,7 +143,7 @@
},
"sourcekit-lsp.inlayHints.enabled": {
"type": "boolean",
"default": false,
"default": true,
"description": "Render inlay type annotations in the editor. Inlay hints require Swift 5.6 or later."
},
"sourcekit-lsp.trace.server": {
Expand Down Expand Up @@ -316,7 +316,7 @@
"@types/glob": "^7.1.4",
"@types/mocha": "^9.0.0",
"@types/node": "14.x",
"@types/vscode": "^1.62.0",
"@types/vscode": "^1.65.0",
"@typescript-eslint/eslint-plugin": "^5.1.0",
"@typescript-eslint/parser": "^5.1.0",
"@vscode/test-electron": "^1.6.2",
Expand Down
7 changes: 7 additions & 0 deletions src/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export interface LSPConfiguration {
readonly serverArguments: string[];
/** Toolchain to use with sourcekit-lsp */
readonly toolchainPath: string;
/** Are inlay hints enabled */
readonly inlayHintsEnabled: boolean;
}

/**
Expand All @@ -46,6 +48,11 @@ const configuration = {
.getConfiguration("sourcekit-lsp")
.get<string>("toolchainPath", "");
},
get inlayHintsEnabled(): boolean {
return vscode.workspace
.getConfiguration("sourcekit-lsp")
.get<boolean>("inlayHints.enabled", true);
},
};
},

Expand Down
27 changes: 15 additions & 12 deletions src/sourcekit-lsp/LanguageClientManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ import { FolderContext } from "../FolderContext";
* workspace folders
*/
export class LanguageClientManager {
// document selector used by language client
static documentSelector = [
{ scheme: "file", language: "swift" },
{ scheme: "untitled", language: "swift" },
{ scheme: "file", language: "c" },
{ scheme: "untitled", language: "c" },
{ scheme: "file", language: "cpp" },
{ scheme: "untitled", language: "cpp" },
{ scheme: "file", language: "objective-c" },
{ scheme: "untitled", language: "objective-c" },
{ scheme: "file", language: "objective-cpp" },
{ scheme: "untitled", language: "objective-cpp" },
];

/** current running client */
private languageClient: langclient.LanguageClient | null | undefined;
private cancellationToken?: vscode.CancellationTokenSource;
Expand Down Expand Up @@ -223,18 +237,7 @@ export class LanguageClientManager {
workspaceFolder = { uri: folder, name: FolderContext.uriName(folder), index: 0 };
}
const clientOptions: langclient.LanguageClientOptions = {
documentSelector: [
{ scheme: "file", language: "swift" },
{ scheme: "untitled", language: "swift" },
{ scheme: "file", language: "c" },
{ scheme: "untitled", language: "c" },
{ scheme: "file", language: "cpp" },
{ scheme: "untitled", language: "cpp" },
{ scheme: "file", language: "objective-c" },
{ scheme: "untitled", language: "objective-c" },
{ scheme: "file", language: "objective-cpp" },
{ scheme: "untitled", language: "objective-cpp" },
],
documentSelector: LanguageClientManager.documentSelector,
revealOutputChannelOn: langclient.RevealOutputChannelOn.Never,
workspaceFolder: workspaceFolder,
};
Expand Down
Loading