feat: implement unsaved changes detection and fix webview disposal error in SQL Editor

Author: jakubkozera

CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to the MS SQL Manager extension will be documented in this f
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.19.12] - 2026-05-29
+
+### Fixed
+
+- **SQL Editor — Unsaved changes detection (dirty state) now works for `.sql` files**
+  - Editing SQL content in the custom SQL Editor webview did not mark the underlying document as modified, so VS Code never showed the "Do you want to save changes?" dialog when closing a file with unsaved edits.
+  - Root cause: the React webview sends a `contentChanged` message when the Monaco editor content changes, but the extension host only handled the `documentChanged` message type — the content change was silently dropped and the `TextDocument` was never updated.
+  - Fix: added `onChange` handler to the Monaco editor component that posts `contentChanged` to the extension on every edit, and added `contentChanged` as a recognized message type in the extension host (both file-backed and untitled query paths).
+  - Added echo-suppression guard to prevent the `onDidChangeTextDocument` → `update` round-trip from bouncing content back to the webview after each keystroke.
+
+- **SQL Editor — "Webview is disposed" error on close**
+  - Closing a SQL Editor tab could throw `Error: Webview is disposed` when a pending document-change event tried to post a message to the already-disposed webview.
+  - Added a disposed-webview guard in the `onDidChangeTextDocument` listener to silently skip the update when the webview is no longer alive.
+
 ## [0.19.11] - 2026-05-29
 
 ### Removed

package.json

@@ -2,7 +2,7 @@
   "name": "ms-sql-manager",
   "displayName": "MS SQL Manager",
   "description": "Manage Microsoft SQL Server databases with connection management, schema browsing, and query execution.",
-  "version": "0.19.11",
+  "version": "0.19.12",
   "publisher": "jakubkozera",
   "icon": "ms-sql-manager.png",
   "sponsor": {

src/sqlEditorProvider.ts

@@ -53,9 +53,22 @@ export class SqlEditorProvider implements vscode.CustomTextEditorProvider {
         // Track webview to document mapping
         this.webviewToDocument.set(webviewPanel.webview, document.uri);
 
-        // Update webview content when document changes
+        // Guard flag to prevent echo-back: when the webview sends a content change,
+        // we apply it to the document, which triggers onDidChangeTextDocument;
+        // without this flag that would send 'update' back to the webview causing
+        // unnecessary round-trips and potential cursor jumps.
+        let suppressNextUpdate = false;
+
+        // Update webview content when document changes (external edits, not webview-originated)
         const changeDocumentSubscription = vscode.workspace.onDidChangeTextDocument(e => {
             if (e.document.uri.toString() === document.uri.toString()) {
+                if (suppressNextUpdate) {
+                    suppressNextUpdate = false;
+                    return;
+                }
+                if (this.disposedWebviews.has(webviewPanel.webview)) {
+                    return;
+                }
                 webviewPanel.webview.postMessage({
                     type: 'update',
                     content: document.getText()
@@ -117,8 +130,10 @@ export class SqlEditorProvider implements vscode.CustomTextEditorProvider {
                     // to give explicit control over when queries execute
                     break;
 
+                case 'contentChanged':
                 case 'documentChanged':
                     // Update the document when the webview content changes
+                    suppressNextUpdate = true;
                     const edit = new vscode.WorkspaceEdit();
                     edit.replace(
                         document.uri,
@@ -2110,6 +2125,7 @@ COMMIT TRANSACTION;
                     }
                     break;
 
+                case 'contentChanged':
                 case 'documentChanged':
                     currentContent = message.content;
                     // Update state for persistence

webview/sqlEditor-react/src/components/Editor/SqlEditor.tsx

@@ -417,6 +417,14 @@ export const SqlEditor = forwardRef<SqlEditorHandle, SqlEditorProps>(
       }
     }, [initialValue, editorReady]);
 
+    // Notify extension host when editor content changes so the underlying
+    // TextDocument is updated and VS Code can track dirty state.
+    const handleEditorChange = useCallback((value: string | undefined) => {
+      if (value !== undefined) {
+        postMessage({ type: 'contentChanged', content: value });
+      }
+    }, [postMessage]);
+
     return (
       <div className="sql-editor-container">
         <MonacoEditor
@@ -426,6 +434,7 @@ export const SqlEditor = forwardRef<SqlEditorHandle, SqlEditorProps>(
           defaultValue={initialValue}
           beforeMount={handleEditorWillMount}
           onMount={handleEditorMount}
+          onChange={handleEditorChange}
           options={{
             automaticLayout: true,
             fixedOverflowWidgets: true,