Warn on duplicate object name for Rename and Move to Schema

extensions/mssql/src/languageservice/sqlMoveToSchemaProvider.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from "vscode";
-import { SqlMoveToSchema as loc } from "../constants/locConstants";
+import { SqlMoveToSchema as loc, msgYes } from "../constants/locConstants";
 import { cmdMoveToSchema } from "../constants/constants";
 import SqlToolsServerClient from "./serviceclient";
 import {
@@ -187,6 +187,18 @@ export class SqlMoveToSchemaProvider implements vscode.CodeActionProvider {
             return;
         }
 
+        // Warn if an object with the same name already exists in the target schema.
+        if (response.message && response.isWarning) {
+            const choice = await vscode.window.showWarningMessage(
+                response.message,
+                { modal: true },
+                msgYes,
+            );
+            if (choice !== msgYes) {
+                return; // user declined — do nothing silently
+            }
+        }
+
         const changes = response.changes as Record<string, SqlSymbolRenameTextEdit[]>;
         const label = loc.previewLabel(targetSchema);
 

extensions/mssql/src/languageservice/sqlSymbolRenameProvider.ts

@@ -12,7 +12,7 @@ import {
     SqlSymbolRenameRequest,
     SqlSymbolRenameTextEdit,
 } from "../models/contracts/languageService";
-import { SqlSymbolRename as loc } from "../constants/locConstants";
+import { SqlSymbolRename as loc, msgYes } from "../constants/locConstants";
 
 /** Escapes a string for safe use inside an XML attribute value (e.g. an Include path). */
 function escapeXmlAttribute(value: string): string {
@@ -152,6 +152,23 @@ export class SqlSymbolRenameProvider implements vscode.RenameProvider {
             throw new Error(loc.renameOnlyInProjectFiles);
         }
 
+        // Hard rejection — surface the error message and abort.
+        if (response.message && !response.isWarning) {
+            throw new Error(response.message);
+        }
+
+        // Name collision warning — ask the user before proceeding.
+        if (response.message && response.isWarning) {
+            const choice = await vscode.window.showWarningMessage(
+                response.message,
+                { modal: true },
+                msgYes,
+            );
+            if (choice !== msgYes) {
+                return new vscode.WorkspaceEdit(); // user declined — apply nothing silently
+            }
+        }
+
         const workspaceEdit = new vscode.WorkspaceEdit();
 
         if (!response.changes || Object.keys(response.changes).length === 0) {

extensions/mssql/src/models/contracts/languageService.ts

@@ -175,6 +175,13 @@ export interface SqlSymbolRenameResponse {
      */
     refactorLogContent: string | null;
     newName: string;
+    /**
+     * When non-null, a message to surface to the user.
+     * If isWarning is true, show a confirmation dialog; otherwise show a blocking error.
+     */
+    message?: string | null;
+    /** True when message is a confirmation warning; false (default) when it is a hard rejection. */
+    isWarning?: boolean;
 }
 
 export namespace SqlSymbolRenameRequest {
@@ -204,6 +211,13 @@ export interface SqlMoveToSchemaResponse {
      */
     refactorLogContent: string | null;
     targetSchema: string;
+    /**
+     * When non-null, a message to surface to the user.
+     * If isWarning is true, show a confirmation dialog; otherwise show a blocking error.
+     */
+    message?: string | null;
+    /** True when message is a confirmation warning; false (default) when it is a hard rejection. */
+    isWarning?: boolean;
 }
 
 export namespace SqlMoveToSchemaRequest {

extensions/mssql/test/unit/sqlSymbolRenameProvider.test.ts

@@ -349,6 +349,79 @@ suite("SqlSymbolRenameProvider Tests", () => {
                 }),
             );
         });
+
+        test("returns empty WorkspaceEdit when STS returns warning message and user cancels", async () => {
+            const projUri = vscode.Uri.file(defaultProjFile);
+            findFilesStub.resolves([projUri]);
+            const fileUri = vscode.Uri.file(defaultSqlFile).toString();
+            sendRequestStub.withArgs(SqlSymbolRenameRequest.type).resolves({
+                changes: {
+                    [fileUri]: [
+                        {
+                            range: {
+                                start: { line: 0, character: 0 },
+                                end: { line: 0, character: 7 },
+                            },
+                            newText: "Orders",
+                        },
+                    ],
+                },
+                newName: "Orders",
+                message:
+                    "A schema object with the name [Orders] already exists. Would you like to continue?",
+                isWarning: true,
+            });
+            sandbox.stub(vscode.window, "showWarningMessage").resolves(undefined); // user dismissed/cancelled
+
+            const doc = makeDocument(sandbox);
+            const edit = await provider.provideRenameEdits(
+                doc,
+                new vscode.Position(0, 0),
+                "Orders",
+                token,
+            );
+
+            expect(edit).to.be.instanceOf(vscode.WorkspaceEdit);
+            expect(edit!.entries()).to.have.length(0); // empty — no changes applied
+        });
+
+        test("applies edits when STS returns warning message and user confirms", async () => {
+            const projUri = vscode.Uri.file(defaultProjFile);
+            findFilesStub.resolves([projUri]);
+            const fileUri = vscode.Uri.file(defaultSqlFile).toString();
+            sendRequestStub.withArgs(SqlSymbolRenameRequest.type).resolves({
+                changes: {
+                    [fileUri]: [
+                        {
+                            range: {
+                                start: { line: 0, character: 0 },
+                                end: { line: 0, character: 7 },
+                            },
+                            newText: "Orders",
+                        },
+                    ],
+                },
+                newName: "Orders",
+                message:
+                    "A schema object with the name [Orders] already exists. Would you like to continue?",
+                isWarning: true,
+            });
+            sandbox
+                .stub(vscode.window, "showWarningMessage")
+                .resolves("Yes" as vscode.MessageItem & string);
+
+            const doc = makeDocument(sandbox);
+            const edit = await provider.provideRenameEdits(
+                doc,
+                new vscode.Position(0, 0),
+                "Orders",
+                token,
+            );
+
+            expect(edit).to.be.instanceOf(vscode.WorkspaceEdit);
+            expect(edit!.entries()).to.have.length(1); // edits applied
+            expect(edit!.entries()[0][0].toString()).to.equal(fileUri);
+        });
     });
 
     // -------------------------------------------------------------------------
@@ -736,6 +809,67 @@ suite("SqlMoveToSchemaProvider Tests", () => {
                     moveLoc.applyEditFailed,
                 );
             });
+
+            test("does not call applyEdit when warning message is returned and user dismisses", async () => {
+                const fileUri = vscode.Uri.file(defaultSqlFile).toString();
+                sendRequestStub
+                    .withArgs(ListProjectSchemasRequest.type)
+                    .resolves({ schemas: ["hr"] });
+                sendRequestStub.withArgs(SqlMoveToSchemaRequest.type).resolves({
+                    changes: {
+                        [fileUri]: [
+                            {
+                                range: {
+                                    start: { line: 0, character: 7 },
+                                    end: { line: 0, character: 14 },
+                                },
+                                newText: "[hr].[MyTable]",
+                            },
+                        ],
+                    },
+                    message:
+                        "A schema object with the name [hr].[MyTable] already exists. Would you like to continue?",
+                    isWarning: true,
+                });
+                messageBoxes.showWarningMessage.resolves(undefined); // user dismissed
+
+                const doc = makeMoveDocument(sandbox, { lineText: "SELECT MyTable" });
+                await provider.runMoveToSchema(doc, new vscode.Position(0, 7));
+
+                expect(applyEditStub).to.not.have.been.called;
+            });
+
+            test("calls applyEdit when warning message is returned and user confirms Yes", async () => {
+                const fileUri = vscode.Uri.file(defaultSqlFile).toString();
+                sendRequestStub
+                    .withArgs(ListProjectSchemasRequest.type)
+                    .resolves({ schemas: ["hr"] });
+                sendRequestStub.withArgs(SqlMoveToSchemaRequest.type).resolves({
+                    changes: {
+                        [fileUri]: [
+                            {
+                                range: {
+                                    start: { line: 0, character: 7 },
+                                    end: { line: 0, character: 14 },
+                                },
+                                newText: "[hr].[MyTable]",
+                            },
+                        ],
+                    },
+                    message:
+                        "A schema object with the name [hr].[MyTable] already exists. Would you like to continue?",
+                    isWarning: true,
+                });
+                messageBoxes.showWarningMessage.resolves("Yes" as vscode.MessageItem & string);
+
+                const doc = makeMoveDocument(sandbox, { lineText: "SELECT MyTable" });
+                await provider.runMoveToSchema(doc, new vscode.Position(0, 7));
+
+                expect(applyEditStub).to.have.been.calledWith(
+                    sinon.match.instanceOf(vscode.WorkspaceEdit),
+                    sinon.match({ isRefactoring: true }),
+                );
+            });
         });
     });
 });