fixed auto/manual detection bug

Author: dcahill

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the "Auto Select Pasted Text" extension will be documented in this file.
 
+## [0.3.3] - 2023-10-17
+### Fixed
+- Resolved bug where certain edge cases could not differentiate auto vs manual selection operations.
+
 ## [0.3.2] - 2023-10-11
 - Added demo gif to README.md
 

package.json

@@ -3,7 +3,7 @@
   "displayName": "Auto Select Pasted Text",
   "description": "Automatically selects text after it's pasted for quick intents and edits.",
   "icon": "autoselectpastedtextlogo.png",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "publisher": "davidcahill",
   "license": "MIT",
   "repository": {

src/extension.ts

@@ -1,10 +1,9 @@
 import * as vscode from 'vscode';
 
-// Variable to store the last pasted content
-let lastPastedContent: string | null = null;
-
 // Flag to track if the selection was auto-selected after pasting
 let autoSelected: boolean = false;
+let manualMouseSelected: boolean = false;
+let manualKeyboardSelected: boolean = false;
 
 export function activate(context: vscode.ExtensionContext) {
     // Create an output channel for logging extension-related activities
@@ -45,26 +44,27 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand('type', (args) => {
         const editor = vscode.window.activeTextEditor;
         const enableTypeDetection = vscode.workspace.getConfiguration('autoSelectPastedText').get('enableTypeDetection');
-        const enableManualSelection = vscode.workspace.getConfiguration('autoSelectPastedText').get('enableManualSelection');
 
         if (editor) {
             const currentSelection = editor.selection;
 
-            if (autoSelected && enableTypeDetection && !currentSelection.isEmpty) {
-                const currentPosition = currentSelection.end;
-                editor.selection = new vscode.Selection(currentPosition, currentPosition);
-                autoSelected = false; // Reset the flag
-            } else if (!autoSelected && enableManualSelection && !currentSelection.isEmpty) {
+            if (enableTypeDetection && autoSelected && !currentSelection.isEmpty) {
                 const currentPosition = currentSelection.end;
                 editor.selection = new vscode.Selection(currentPosition, currentPosition);
             }
         }
         vscode.commands.executeCommand('default:type', args);
     });
 
+
     // Register the paste command
     let pasteCommandDisposable = vscode.commands.registerCommand('editor.action.clipboardPasteAction', async () => {
         const enableAutoSelection = vscode.workspace.getConfiguration('autoSelectPastedText').get('enableAutoSelection');
+        const enableManualSelection = vscode.workspace.getConfiguration('autoSelectPastedText').get('enableManualSelection');
+
+        if (manualMouseSelected || manualKeyboardSelected) {
+            autoSelected = false;
+        }
 
         log('Paste command executed.');
 
@@ -77,12 +77,11 @@ export function activate(context: vscode.ExtensionContext) {
                 let targetSelection: vscode.Selection;
 
                 // Determine the target for the paste: either append after the current selection or replace it
-                if (clipboardContent === lastPastedContent) {
+                if (autoSelected || enableManualSelection) {
                     const currentPosition = editor.selection.end;
                     targetSelection = new vscode.Selection(currentPosition, currentPosition);
                 } else {
                     targetSelection = editor.selection;
-                    lastPastedContent = clipboardContent;  // Cache the clipboard content
                 }
 
                 // Split content by lines to calculate the selection end position later
@@ -104,7 +103,6 @@ export function activate(context: vscode.ExtensionContext) {
                         if (enableAutoSelection) {
                             // Adjust the selection to cover the pasted content
                             editor.selection = new vscode.Selection(targetSelection.start, endPosition);
-                            // Set the autoSelected flag since we've auto-selected the pasted text
                             autoSelected = true;
                         }
                         // Reveal the pasted content in the editor
@@ -115,19 +113,29 @@ export function activate(context: vscode.ExtensionContext) {
                 });
             }
         }
+        // At the end of this command, reset the manual selection flags:
+        manualMouseSelected = false;
+        manualKeyboardSelected = false;
     });
 
     // Add the paste command disposable to the extension context's subscriptions
     context.subscriptions.push(pasteCommandDisposable);
 
     // Debug: Log selection changes in the editor for tracking
     vscode.window.onDidChangeTextEditorSelection((event) => {
+        if (event.kind === vscode.TextEditorSelectionChangeKind.Mouse) {
+            manualMouseSelected = true;
+        } else if (event.kind === vscode.TextEditorSelectionChangeKind.Keyboard) {
+            manualKeyboardSelected = true;
+        }
+
         if (event.textEditor.document.uri.scheme === 'file') {
+            autoSelected = event.kind === 3;
             const selections = event.selections;
             if (selections && selections.length > 0) {
                 const selection = selections[0];
                 log(`Selection changed: Start(${selection.start.line}, ${selection.start.character}), End(${selection.end.line}, ${selection.end.character})`);
             }
         }
     });
-}
+}