Fix diagnostics where no command is passed (#4765)

* fix diagnostics where no command is passed

* update changelog

Author: gcampbell-msft

CHANGELOG.md

@@ -41,6 +41,7 @@ Bug Fixes:
 - Fix `$comment` not being accepted inside a cacheVariable object in CMake presets. [#4600](https://github.com/microsoft/vscode-cmake-tools/issues/4600)
 - Fix kits from `cmake.additionalKits` not being shown when `cmake.showSystemKits` is `false`. [#4651](https://github.com/microsoft/vscode-cmake-tools/issues/4651)
 - Fix how `jobs` is handled in build presets. Also update how `cmake.parallelJobs` is handled as a fallback when a build preset does not define `jobs`. [#4176](https://github.com/microsoft/vscode-cmake-tools/issues/4176)
+- Fix diagnostics to handle when there isn't a command in the error output. [PR #4765](https://github.com/microsoft/vscode-cmake-tools/pull/4765)
 
 ## 1.22.28
 

src/diagnostics/cmake.ts

@@ -106,10 +106,10 @@ export class CMakeOutputConsumer extends CommandConsumer {
         // Switch on the state to implement our crude FSM
         switch (this._errorState.state) {
             case 'init': {
-                const re = /CMake (.*?)(?: \(dev\))? at (.*?):(\d+) \((.*?)\):/;
+                const re = /CMake (.*?)(?: \(dev\))? at (.*?):(\d+)(?: \((.*?)\))?:/;
                 const result = re.exec(line);
                 if (result) {
-                    // We have encountered and error
+                    // We have encountered an error
                     const [full, level, filename, linestr, command] = result;
                     const lineno = oneLess(linestr);
                     const diagmap: { [k: string]: vscode.DiagnosticSeverity } = {
@@ -118,7 +118,7 @@ export class CMakeOutputConsumer extends CommandConsumer {
                         Error: vscode.DiagnosticSeverity.Error
                     };
                     const vsdiag = new vscode.Diagnostic(new vscode.Range(lineno, 0, lineno, 9999), full, diagmap[level]);
-                    vsdiag.source = `CMake (${command})`;
+                    vsdiag.source = command ? `CMake (${command})` : 'CMake';
                     vsdiag.relatedInformation = [];
                     const filepath = util.resolvePath(filename, this.sourceDir);
                     this._errorState.diag = {

test/unit-tests/diagnostics.test.ts

@@ -165,6 +165,23 @@ suite('Diagnostics', () => {
         expect(warning.diag.range.start.line).to.eq(14);
         expect(warning.diag.source).to.eq('CMake (message)');
     });
+    test('Parse error without command name', () => {
+        const error_output = [
+            'CMake Error at CMakeLists.txt:5:',
+            '  Parse error.  Expected "(", got newline with text "',
+            '',
+            '   ".',
+            '',
+            ''
+        ];
+        feedLines(consumer, [], error_output);
+        expect(consumer.diagnostics.length).to.eq(1);
+        const diag = consumer.diagnostics[0];
+        expect(diag.filepath).to.eq('dummyPath/CMakeLists.txt');
+        expect(diag.diag.severity).to.eq(vscode.DiagnosticSeverity.Error);
+        expect(diag.diag.source).to.eq('CMake');
+        expect(diag.diag.range.start.line).to.eq(4);
+    });
     test('Populate a diagnostic collection', () => {
         const error_output = [
             'CMake Warning at CMakeLists.txt:14 (message):',