Make actions to transform case.

aioutecism · Mar 10, 2017 · 7c5a68b · 7c5a68b
1 parent f61796a
commit 7c5a68b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git a/src/Actions/Case.ts b/src/Actions/Case.ts
@@ -1,4 +1,4 @@
-import {window, Range} from 'vscode';
+import {commands, window, Range} from 'vscode';
 import {StaticReflect} from '../LanguageExtensions/StaticReflect';
 import {SymbolMetadata} from '../Symbols/Metadata';
 import {ActionReveal} from './Reveal';
@@ -24,6 +24,30 @@ export class ActionCase {
             .then(() => ActionReveal.primaryCursor());
     }
 
+    @StaticReflect.metadata(SymbolMetadata.Action.isChange, true)
+    static lowercaseSelections(): Thenable<boolean> {
+        const activeTextEditor = window.activeTextEditor;
+
+        if (! activeTextEditor) {
+            return Promise.resolve(false);
+        }
+
+        return commands.executeCommand('editor.action.transformToLowercase')
+            .then(() => ActionReveal.primaryCursor());
+    }
+
+    @StaticReflect.metadata(SymbolMetadata.Action.isChange, true)
+    static uppercaseSelections(): Thenable<boolean> {
+        const activeTextEditor = window.activeTextEditor;
+
+        if (! activeTextEditor) {
+            return Promise.resolve(false);
+        }
+
+        return commands.executeCommand('editor.action.transformToUppercase')
+            .then(() => ActionReveal.primaryCursor());
+    }
+
     @StaticReflect.metadata(SymbolMetadata.Action.isChange, true)
     static switchActives(args: {n?: number}): Thenable<boolean> {
         args.n = args.n === undefined ? 1 : args.n;

diff --git a/src/Modes/Visual.ts b/src/Modes/Visual.ts
@@ -1,4 +1,4 @@
-import {commands, window} from 'vscode';
+import {window} from 'vscode';
 import {StaticReflect} from '../LanguageExtensions/StaticReflect';
 import {SymbolMetadata} from '../Symbols/Metadata';
 import {RangeOffset} from '../Types/RangeOffset';
@@ -87,11 +87,11 @@ export class ModeVisual extends Mode {
             ActionSelection.shrinkToStarts,
         ] },
         { keys: 'u', actions: [
-            () => commands.executeCommand('editor.action.transformToLowercase'),
+            ActionCase.lowercaseSelections,
             ActionSelection.shrinkToStarts,
         ] },
         { keys: 'U', actions: [
-            () => commands.executeCommand('editor.action.transformToUppercase'),
+            ActionCase.uppercaseSelections,
             ActionSelection.shrinkToStarts,
         ] },
 

diff --git a/src/Modes/VisualLine.ts b/src/Modes/VisualLine.ts
@@ -1,4 +1,4 @@
-import {commands, window} from 'vscode';
+import {window} from 'vscode';
 import {StaticReflect} from '../LanguageExtensions/StaticReflect';
 import {SymbolMetadata} from '../Symbols/Metadata';
 import {RangeOffset} from '../Types/RangeOffset';
@@ -94,11 +94,11 @@ export class ModeVisualLine extends Mode {
             ActionSelection.shrinkToStarts,
         ] },
         { keys: 'u', actions: [
-            () => commands.executeCommand('editor.action.transformToLowercase'),
+            ActionCase.lowercaseSelections,
             ActionSelection.shrinkToStarts,
         ] },
         { keys: 'U', actions: [
-            () => commands.executeCommand('editor.action.transformToUppercase'),
+            ActionCase.uppercaseSelections,
             ActionSelection.shrinkToStarts,
         ] },