Skip to content

Commit

Permalink
Merge branch 'master' into autoinstall
Browse files Browse the repository at this point in the history
  • Loading branch information
sam-mccall authored Apr 26, 2020
2 parents 8ecc73a + 594f792 commit 86ab231
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@
},
"description": "Arguments for clangd server"
},
"clangd.syncFileEvents": {
"type": "boolean",
"default": true,
"description": "Whether or not to send file events to clangd (File created, changed or deleted). This can be disabled for performance consideration."
},
"clangd.trace": {
"type": "string",
"description": "Names a file that clangd should log a performance trace to, in chrome trace-viewer JSON format."
Expand Down
5 changes: 0 additions & 5 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ class EnableEditsNearCursorFeature implements vscodelc.StaticFeature {
* activated the very first time a command is executed.
*/
export async function activate(context: vscode.ExtensionContext) {
const syncFileEvents = getConfig<boolean>('syncFileEvents', true);

const clangdPath = getConfig<string>('path');
try {
await util.promisify(which)(clangdPath);
Expand Down Expand Up @@ -81,9 +79,6 @@ export async function activate(context: vscode.ExtensionContext) {
{ scheme: 'file', language: 'objective-c' },
{ scheme: 'file', language: 'objective-cpp' }
],
synchronize: !syncFileEvents ? undefined : {
// FIXME: send sync file events when clangd provides implementations.
},
initializationOptions: { clangdFileStatus: true },
// Do not switch to output window when clangd returns output.
revealOutputChannelOn: vscodelc.RevealOutputChannelOn.Never,
Expand Down

0 comments on commit 86ab231

Please sign in to comment.