diff --git a/vscode-clice/package.json b/vscode-clice/package.json index e66b1f77..43f972f8 100644 --- a/vscode-clice/package.json +++ b/vscode-clice/package.json @@ -12,8 +12,18 @@ "activationEvents": [ "onLanguage:cpp" ], + "contributes": { + "configuration": { + "type": "object", + "title": "C/C++ Language Client", + "properties": { + "clice-client.trace.server": { + "default": "verbose" + } + } + } + }, "main": "./dist/extension.js", - "contributes": {}, "scripts": { "vscode:prepublish": "npm run package", "compile": "webpack", diff --git a/vscode-clice/src/extension.ts b/vscode-clice/src/extension.ts index a22c5089..31ffc0a0 100644 --- a/vscode-clice/src/extension.ts +++ b/vscode-clice/src/extension.ts @@ -1,10 +1,10 @@ import * as path from 'path'; import { workspace, window, ExtensionContext, OutputChannel } from 'vscode'; -import { LanguageClient, LanguageClientOptions, ServerOptions, Trace ,TransportKind } from 'vscode-languageclient/node'; +import { LanguageClient, LanguageClientOptions, ServerOptions, Trace, TransportKind } from 'vscode-languageclient/node'; let client: LanguageClient; -export function activate(context: ExtensionContext) { +export async function activate(context: ExtensionContext) { console.log('Congratulations, your extension "clice" is now active!'); let channel = window.createOutputChannel('clice'); @@ -14,29 +14,27 @@ export function activate(context: ExtensionContext) { const serverOptions: ServerOptions = { run: { command: serverPath, args: [] }, debug: { command: serverPath, args: ['--inspect=6009'] } + }; const clientOptions: LanguageClientOptions = { documentSelector: [{ scheme: 'file', language: 'cpp' }], traceOutputChannel: channel, - //outputChannel: channel, + // outputChannel: channel, synchronize: { fileEvents: workspace.createFileSystemWatcher('**/.clientrc') }, + }; client = new LanguageClient( - 'languageServerExample', - 'Language Server Example', + 'clice-client', + 'client for clice language server', serverOptions, clientOptions ); - client.onTelemetry(e => { - console.log(e); - }); - client.start(); }