Merge branch 'main' into fix/replace-deprecated-ui-toolkit

Author: arneschmid

.github/workflows/codeql.yml

@@ -43,16 +43,16 @@ jobs:
 
       - name: Initialize CodeQL
         id: initialize
-        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           queries: security-extended 
           languages: TypeScript
           source-root: src
 
       - name: Autobuild
         id: autobuild
-        uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
 
       - name: Perform CodeQL Analysis
         id: analyze
-        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

.github/workflows/scorecard.yml

@@ -51,6 +51,6 @@ jobs:
           retention-days: 5
 
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           sarif_file: results.sarif

media/styles.css

@@ -1,3 +1,19 @@
+/**
+ * Copyright 2026 Arm Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 body section {
     display: flex;
 }

scripts/copyright-manager.ts

@@ -24,7 +24,7 @@ const args = minimist(process.argv.slice(2));
 const mode = args.mode || 'check';
 
 
-const DEFAULT_INCLUDE_GLOBS = ['src/**/*.ts', 'scripts/**/*.ts', 'api/**/*.ts', '__mocks__/**/*.ts'];
+const DEFAULT_INCLUDE_GLOBS = ['src/**/*.ts', 'scripts/**/*.ts', 'api/**/*.ts', '__mocks__/**/*.ts', '**/*.tsx', '**/*.css'];
 const DEFAULT_EXCLUDE_GLOBS = ['**/node_modules/**', 'coverage/**', 'dist/**', 'tools/**', 'src/json-rpc/**', 'test-data/**', 'test-workspace/**'];
 
 const includeGlobs: string[] = args.include ? args.include.split(',') : DEFAULT_INCLUDE_GLOBS;
@@ -47,7 +47,7 @@ const COPYRIGHT_TEXT = `/**
  */`;
 
 // Regular expression to match the copyright notice
-const COPYRIGHT_REGEX = /\/\*\*\n \* Copyright 20\d{2}(?:-(?:20\d{2}))? Arm Limited[\s\S]*?\*\//;
+const COPYRIGHT_REGEX = /\/\*\*\r?\n \* Copyright 20\d{2}(?:-(?:20\d{2}))? Arm Limited[\s\S]*?\*\//;
 
 function getFiles(): string[] {
     const allFiles: string[] = [];

src/solutions/solution-problems.test.ts

@@ -70,7 +70,42 @@ describe('SolutionProblems', () => {
 
         await solutionProblems.activate(context);
 
-        expect(context.subscriptions).toHaveLength(2);
+        expect(context.subscriptions).toHaveLength(3);
+    });
+
+    it('clears diagnostics when solution path changes', async () => {
+        await solutionProblems.activate({ subscriptions: [] } as unknown as ExtensionContext);
+        const clearSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'clear');
+
+        solutionManager.fireOnDidChangeLoadState(
+            { solutionPath: '/work/new.csolution.yml' },
+            { solutionPath: '/work/old.csolution.yml' }
+        );
+
+        expect(clearSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it('clears diagnostics when solution is closed', async () => {
+        await solutionProblems.activate({ subscriptions: [] } as unknown as ExtensionContext);
+        const clearSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'clear');
+
+        solutionManager.fireOnDidChangeLoadState(
+            { solutionPath: undefined },
+            { solutionPath: '/work/old.csolution.yml' }
+        );
+
+        expect(clearSpy).toHaveBeenCalledTimes(1);
+    });
+    it('does not clear diagnostics when solution path is unchanged', async () => {
+        await solutionProblems.activate({ subscriptions: [] } as unknown as ExtensionContext);
+        const clearSpy = jest.spyOn(vscode.languages.createDiagnosticCollection(), 'clear');
+
+        solutionManager.fireOnDidChangeLoadState(
+            { solutionPath: '/work/same.csolution.yml' },
+            { solutionPath: '/work/same.csolution.yml' }
+        );
+
+        expect(clearSpy).not.toHaveBeenCalled();
     });
 
     it('creates diagnostics from convert completed log messages', async () => {

src/solutions/solution-problems.ts

@@ -23,7 +23,7 @@ import * as fsUtils from '../utils/fs-utils';
 import { getFileNameFromPath } from '../utils/path-utils';
 import { stripTwoExtensions } from '../utils/string-utils';
 import { getWorkspaceFolder } from '../utils/vscode-utils';
-import { SolutionManager } from './solution-manager';
+import { SolutionLoadStateChangeEvent, SolutionManager } from './solution-manager';
 import { ConvertResultData, SolutionEventHub } from './solution-event-hub';
 
 export const toolsPrefixPatterns = {
@@ -108,6 +108,10 @@ export interface SolutionProblems {
 export class SolutionProblemsImpl implements SolutionProblems {
 
     private readonly diagnosticCollection: vscode.DiagnosticCollection = vscode.languages.createDiagnosticCollection('csolution');
+    /**
+    *  source files for diagnostics mapping
+    */
+    private readonly sourceFiles: Map<string, string> = new Map<string, string>();
 
     private readonly queryActionPatterns: ReadonlyArray<{ pattern: RegExp; action: 'components-packs' | 'find-in-files' }> = [
         { pattern: /dependency validation for context '([^']+)' failed:/, action: 'components-packs' },
@@ -126,6 +130,7 @@ export class SolutionProblemsImpl implements SolutionProblems {
     public async activate(context: vscode.ExtensionContext): Promise<void> {
         context.subscriptions.push(
             this.eventHub.onDidConvertCompleted(this.handleConvertCompleted, this),
+            this.solutionManager.onDidChangeLoadState(this.handleLoadStateChanged, this),
             this.diagnosticCollection,
         );
     }
@@ -135,6 +140,12 @@ export class SolutionProblemsImpl implements SolutionProblems {
         await this.updateDiagnostics(data.logMessages);
     }
 
+    private handleLoadStateChanged(data: SolutionLoadStateChangeEvent): void {
+        if (data.previousState.solutionPath !== data.newState.solutionPath) {
+            this.clearDiagnostics();
+        }
+    }
+
     /**
     *  log message regex in the format <filename>:<line>:<column> - <message>
     *  regex named groups:
@@ -195,10 +206,17 @@ export class SolutionProblemsImpl implements SolutionProblems {
         return true;
     }
 
-    private async updateDiagnostics(messages: LogMessages): Promise<void> {
-        // clear previous diagnostics
+    /**
+     * Clear diagnostic and collected files
+     */
+    private clearDiagnostics(): void {
         this.diagnosticCollection.clear();
         this.collectYmlFiles();
+    }
+
+    private async updateDiagnostics(messages: LogMessages): Promise<void> {
+        // clear previous diagnostics
+        this.clearDiagnostics();
         let diagnostics = false;
 
         // iterate through log messages and set diagnostics
@@ -216,11 +234,6 @@ export class SolutionProblemsImpl implements SolutionProblems {
         }
     }
 
-    /**
-    *  source files for diagnostics mapping
-    */
-    private readonly sourceFiles: Map<string, string> = new Map<string, string>();
-
     private addFile(file: string): void {
         if (file.length > 0) {
             this.sourceFiles.set(getFileNameFromPath(file), file);

src/views/common/components/cmsis-codicon.tsx

@@ -1,5 +1,17 @@
-/*
- * Copyright (C) 2026 Arm Limited
+/**
+ * Copyright 2026 Arm Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import React from 'react';

src/views/common/components/compact-dropdown.css

@@ -1,5 +1,17 @@
-/*
- * Copyright (c) 2022-2026 Arm Limited
+/**
+ * Copyright 2022-2026 Arm Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 :root {

src/views/common/components/compact-dropdown.test.tsx

@@ -1,9 +1,19 @@
 /**
- * Copyright (C) 2021-2026 Arm Limited
+ * Copyright 2026 Arm Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
-
-
 import 'jest';
 import * as React from 'react';
 import { createRoot } from 'react-dom/client';

src/views/common/components/compact-dropdown.tsx

@@ -1,5 +1,17 @@
 /**
- * Copyright (C) 2021-2026 Arm Limited
+ * Copyright 2026 Arm Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import * as React from 'react';