Bring code actions back

Author: colin-grant-work

packages/ai-chat/src/browser/change-set-file-element.ts

@@ -38,6 +38,7 @@ import { ChangeSetDecoratorService } from './change-set-decorator-service';
 import { createChangeSetFileUri } from './change-set-file-resource';
 import { ChangeSetFileService } from './change-set-file-service';
 import { Deferred } from '@theia/core/lib/common/promise-util';
+import { MonacoCodeActionService } from '@theia/monaco/lib/browser';
 
 export const ChangeSetFileElementFactory = Symbol('ChangeSetFileElementFactory');
 export type ChangeSetFileElementFactory = (elementProps: ChangeSetElementArgs) => ChangeSetFileElement;
@@ -97,6 +98,9 @@ export class ChangeSetFileElement implements ChangeSetElement {
     @inject(FileSystemPreferences)
     protected readonly fileSystemPreferences: FileSystemPreferences;
 
+    @inject(MonacoCodeActionService)
+    protected readonly codeActionService: MonacoCodeActionService;
+
     protected readonly toDispose = new DisposableCollection();
     protected _state: ChangeSetElementState;
 
@@ -295,7 +299,9 @@ export class ChangeSetFileElement implements ChangeSetElement {
 
             // Get language and URI for preference lookup
             const languageId = tempModel.object.languageId;
-            const uriStr = tempModel.object.uri.toString();
+            const uriStr = this.uri.toString();
+
+            await this.codeActionService.applyOnSaveCodeActions(tempModel.object.textEditorModel, languageId, uriStr, CancellationToken.None);
 
             const formatOnSave = this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier: languageId }, undefined, uriStr);
             if (formatOnSave) {

packages/ai-chat/src/common/chat-session-summary-agent-prompt.ts

@@ -23,7 +23,7 @@ export const CHAT_SESSION_SUMMARY_PROMPT = {
             'Ensure that the summary is sufficiently comprehensive to allow seamless continuation of the workflow. ' +
             'The summary will primarily be used by other AI agents, so tailor your response for use by AI agents. ' +
             'Also consider the system message. ' +
-            'Make sure you include all necessary context information and use unique references(such as URIs, file paths, etc.). ' +
+            'Make sure you include all necessary context information and use unique references (such as URIs, file paths, etc.). ' +
             'If the conversation was about a task, describe the state of the task, i.e.what has been completed and what is open. ' +
             'If a changeset is open in the session, describe the state of the suggested changes. ' +
             `\n\n{{${CHANGE_SET_SUMMARY_VARIABLE_ID}}}`,

packages/monaco/src/browser/monaco-code-action-save-participant.ts

@@ -19,8 +19,8 @@ import { SaveOptions, SaveReason } from '@theia/core/lib/browser';
 import { MonacoEditor } from './monaco-editor';
 import { SaveParticipant, SAVE_PARTICIPANT_DEFAULT_ORDER } from './monaco-editor-provider';
 import { inject, injectable } from '@theia/core/shared/inversify';
-
 import { MonacoCodeActionService } from './monaco-code-action-service';
+
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
@@ -38,22 +38,12 @@ export class MonacoCodeActionSaveParticipant implements SaveParticipant {
             return undefined;
         }
 
-        const codeActionSets = await this.codeActionService.getAllCodeActionsOnSave(
+        await this.codeActionService.applyOnSaveCodeActions(
             editor.document.textEditorModel,
             editor.document.textEditorModel.getLanguageId(),
             editor.document.textEditorModel.uri.toString(),
             cancellationToken
         );
-
-        if (!codeActionSets) {
-            return;
-        }
-
-        await this.codeActionService.applyCodeActions(
-            editor.document.textEditorModel,
-            codeActionSets,
-            cancellationToken
-        );
     }
 
 }

packages/monaco/src/browser/monaco-code-action-service.ts

@@ -53,13 +53,33 @@ export interface MonacoCodeActionService {
      * @param token Cancellation token
      */
     applyCodeActions(model: ITextModel, codeActionSets: CodeActionSet[], token: CancellationToken): Promise<void>;
+
+    /**
+     * Applies all code actions that should be run on save for the given model and language identifier.
+     * This is a convenience method that retrieves all on-save code actions and applies them.
+     * @param model The text model to apply code actions to
+     * @param languageId The language identifier for preference lookup
+     * @param uri The URI string for preference scoping
+     * @param token Cancellation token
+     */
+    applyOnSaveCodeActions(model: ITextModel, languageId: string, uri: string, token: CancellationToken): Promise<void>;
 }
 
 @injectable()
 export class MonacoCodeActionServiceImpl implements MonacoCodeActionService {
     @inject(EditorPreferences)
     protected readonly editorPreferences: EditorPreferences;
 
+    async applyOnSaveCodeActions(model: ITextModel, languageId: string, uri: string, token: CancellationToken): Promise<void> {
+        const codeActionSets = await this.getAllCodeActionsOnSave(model, languageId, uri, token);
+
+        if (!codeActionSets || token.isCancellationRequested) {
+            return;
+        }
+
+        await this.applyCodeActions(model, codeActionSets, token);
+    }
+
     async getAllCodeActionsOnSave(model: ITextModel, languageId: string, uri: string, token: CancellationToken): Promise<CodeActionSet[] | undefined> {
         const setting = this.editorPreferences.get({
             preferenceName: 'editor.codeActionsOnSave',