arduino
diff --git a/‎package.json
Copy file name to clipboardExpand all lines: package.json
+5-1Lines changed: 5 additions & 1 deletion b/‎package.json
Copy file name to clipboardExpand all lines: package.json
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/extension.ts
Copy file name to clipboardExpand all lines: src/extension.ts
+30-13Lines changed: 30 additions & 13 deletions b/‎src/extension.ts
Copy file name to clipboardExpand all lines: src/extension.ts
+30-13Lines changed: 30 additions & 13 deletions
@@ -80,7 +80,11 @@
           "ino"
         ],
         "extensions": [
-          ".ino"
+          ".ino",
+          ".c",
+          ".cpp",
+          ".h",
+          ".hpp"
         ],
         "configuration": "./languages/ino.language-configuration.json"
       }
 
@@ -1,4 +1,6 @@
-import { posix } from 'path';
+import { stat } from 'fs';
+import { basename } from 'path';
+import { promisify } from 'util';
 import { spawnSync } from 'child_process';
 import deepEqual from 'deep-equal';
 import WebRequest from 'web-request';
@@ -9,14 +11,17 @@ interface LanguageServerConfig {
     readonly lsPath: string;
     readonly cliPath: string;
     readonly clangdPath: string;
-    /**
-     * Filesystem path pointing to the folder that contains the `compile_commands.json` file.
-     */
-    readonly compileCommandsPath?: string;
     readonly board: {
         readonly fqbn: string;
         readonly name?: string;
     }
+    /**
+     * `true` if the LS should generate log files into the default location. The default location is `cwd` of the process. It's very often the same
+     * as the workspace root of the IDE, aka the sketch folder.
+     * When it is a string, it is the folder where the log files should be generated. If the path is invalid (does not exist, not a folder),
+     * the log files will be generated into the default location.
+     */
+    readonly log?: boolean | string;
     readonly env?: any;
     readonly flags?: string[];
 }
@@ -75,7 +80,7 @@ async function startDebug(_: ExtensionContext, config: DebugConfig): Promise<boo
     if (!rawStdout) {
         if (rawStdErr) {
             if (rawStdErr.indexOf('compiled sketch not found in') !== -1) {
-                vscode.window.showErrorMessage(`Sketch '${posix.basename(config.sketchPath)}' was not compiled. Please compile the sketch and start debugging again.`);
+                vscode.window.showErrorMessage(`Sketch '${basename(config.sketchPath)}' was not compiled. Please compile the sketch and start debugging again.`);
             } else {
                 vscode.window.showErrorMessage(rawStdErr);
             }
@@ -129,32 +134,44 @@ async function startLanguageServer(context: ExtensionContext, config: LanguageSe
     }
     if (!languageClient || !deepEqual(latestConfig, config)) {
         latestConfig = config;
-        languageClient = buildLanguageClient(config);
+        languageClient = await buildLanguageClient(config);
         crashCount = 0;
     }
 
     languageServerDisposable = languageClient.start();
     context.subscriptions.push(languageServerDisposable);
 }
 
-function buildLanguageClient(config: LanguageServerConfig): LanguageClient {
+async function buildLanguageClient(config: LanguageServerConfig): Promise<LanguageClient> {
     if (!serverOutputChannel) {
         serverOutputChannel = vscode.window.createOutputChannel('Arduino Language Server');
     }
     if (!serverTraceChannel) {
         serverTraceChannel = vscode.window.createOutputChannel('Arduino Language Server (trace)');
     }
-    const { lsPath: command, clangdPath, cliPath, board, flags, env, compileCommandsPath } = config;
+    const { lsPath: command, clangdPath, cliPath, board, flags, env, log } = config;
     const args = ['-clangd', clangdPath, '-cli', cliPath, '-fqbn', board.fqbn];
     if (board.name) {
         args.push('-board-name', board.name);
     }
-    if (compileCommandsPath) {
-        args.push('-compile-commands-dir', compileCommandsPath);
-    }
     if (flags && flags.length) {
         args.push(...flags);
     }
+    if (!!log) {
+        args.push('-log');
+        let logPath: string | undefined = undefined;
+        if (typeof log === 'string') {
+            try {
+                const stats = await promisify(stat)(log);
+                if (stats.isDirectory()) {
+                    logPath = log;
+                }
+            } catch { }
+        }
+        if (logPath) {
+            args.push('-logpath', logPath);
+        }
+    }
     return new LanguageClient(
         'ino',
         'Arduino Language Server',
@@ -165,7 +182,7 @@ function buildLanguageClient(config: LanguageServerConfig): LanguageClient {
         },
         {
             initializationOptions: {},
-            documentSelector: ['ino'],
+            documentSelector: ['ino', 'c', 'cpp', 'h', 'hpp'],
             uriConverters: {
                 code2Protocol: (uri: vscode.Uri): string => (uri.scheme ? uri : uri.with({ scheme: 'file' })).toString(),
                 protocol2Code: (uri: string) => vscode.Uri.parse(uri)