Merge pull request #18 from cpmcgrath/develop

Version 2

Author: cpmcgrath

CHANGELOG.md

@@ -2,12 +2,16 @@
 All notable changes to the "codealignment-vscode" extension will be documented in this file.
 
 ## [Unreleased]
-- #6 Allow Alignments from Caret Position
-- #8 Expose Align by Space
+
+## 2.0 - 2018-01-28
+- Allow Alignments from Caret Position  (Ticket 6)
+- Expose Align by Space  (Ticket 8)
+- Change Align by equals delimiter to be a space then equals (Ticket 16)
+- Fixed: Automatic scope selection is used when column marking is used (Ticket 15)
 
 ## 1.2 - 2018-01-28
 ### Added
-- #10 Introduce key bindings 
+- Introduce key bindings (Ticket 10)
 
 ## 1.0 - 2018-01-27
 ### Added

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.2.{build}
+version: 2.0.{build}
 image: Visual Studio 2017
 
 platform:

package.json

@@ -14,7 +14,8 @@
         "onCommand:codealignment.alignbyequals",
         "onCommand:codealignment.alignbyperiod",
         "onCommand:codealignment.alignbyquote",
-        "onCommand:codealignment.alignbyregex"
+        "onCommand:codealignment.alignbyregex",
+        "onCommand:codealignment.alignbyspace"
     ],
     "main": "./out/extension",
     "contributes": {
@@ -23,13 +24,17 @@
             { "command": "codealignment.alignbyequals", "title"  : "Align by equals (Code Alignment)" },
             { "command": "codealignment.alignbyperiod", "title"  : "Align by period (Code Alignment)" },
             { "command": "codealignment.alignbyquote",  "title"  : "Align by quote (Code Alignment)" },
-            { "command": "codealignment.alignbyregex",  "title"  : "Align by regex (Code Alignment)" }
+            { "command": "codealignment.alignbyregex",  "title"  : "Align by regex (Code Alignment)" },
+            { "command": "codealignment.alignbyspace",  "title"  : "Align by space (Code Alignment)" }
         ],
         "keybindings" : [
-            { "command": "codealignment.alignbystring", "key": "ctrl+shift+=",  "mac": "cmd+shift+=", "when": "editorTextFocus"},
-            { "command": "codealignment.alignbyequals", "key": "ctrl+= ctrl+=", "mac": "cmd+= cmd+=", "when": "editorTextFocus"},
-            { "command": "codealignment.alignbyperiod", "key": "ctrl+= ctrl+.", "mac": "cmd+= cmd+.", "when": "editorTextFocus"},
-            { "command": "codealignment.alignbyquote",  "key": "ctrl+= ctrl+'", "mac": "cmd+= cmd+'", "when": "editorTextFocus"}
+            { "command": "codealignment.alignbystring",          "key": "ctrl+shift+=",        "mac": "cmd+shift+=",       "when": "editorTextFocus"},
+            { "command": "codealignment.alignbyequals",          "key": "ctrl+= ctrl+=",       "mac": "cmd+= cmd+=",       "when": "editorTextFocus"},
+            { "command": "codealignment.alignbyequalsfromcaret", "key": "ctrl+= ctrl+shift+=", "mac": "cmd+= cmd+shift+=", "when": "editorTextFocus"},
+            { "command": "codealignment.alignbyperiod",          "key": "ctrl+= ctrl+.",       "mac": "cmd+= cmd+.",       "when": "editorTextFocus"},
+            { "command": "codealignment.alignbyquote",           "key": "ctrl+= ctrl+'",       "mac": "cmd+= cmd+'",       "when": "editorTextFocus"},
+            { "command": "codealignment.alignbyquotefromcaret",  "key": "ctrl+= ctrl+shift+'", "mac": "cmd+= cmd+shift+'", "when": "editorTextFocus"},
+            { "command": "codealignment.alignbyspace",           "key": "ctrl+= ctrl+space",   "mac": "cmd+= cmd+space",   "when": "editorTextFocus"}
         ]
     },
     "scripts": {

src/common/business/delimiterFinders/RegexDelimiterFinder.ts

@@ -16,14 +16,14 @@ export class RegexDelimiterFinder extends NormalDelimiterFinder
         //var match = Regex.Match(source.substring(minIndex), delimiter);
         var match = source.substring(minIndex).match(delimiter);
 
-        if (match.length === 0)
+        if (match === null)
         {
             return DelimiterResult.Create(-1);
         }
 
         var result = new DelimiterResult();
-        result.CompareIndex = minIndex + this.GetGroupIndex(match, "compare", "x"),
-        result.InsertIndex  = minIndex + this.GetGroupIndex(match, "insert", "compare", "x")
+        result.CompareIndex = minIndex + this.GetGroupIndex(match, "compare", "x");
+        result.InsertIndex  = minIndex + this.GetGroupIndex(match, "insert", "compare", "x");
         return result;
     }
 

src/extension.ts

@@ -8,18 +8,25 @@ import { GeneralScopeSelector } from './common/business/selectors/GeneralScopeSe
 import { RegexDelimiterFinder } from './common/business/delimiterFinders/RegexDelimiterFinder';
 import { Options              } from './common/business/Options';
 
-function doAlignment(delimiter: string, useRegex: boolean = false)
+function doAlignment(delimiter: string, useRegex: boolean = false, fromCaret: boolean = false)
 {
-    var alignment      = new Alignment();
+    let alignment      = new Alignment();
     alignment.View     = new Document(vscode.window.activeTextEditor);
-    var selector       = new GeneralScopeSelector();
+    let selector       = new GeneralScopeSelector();
     selector.ScopeSelectorRegex = new Options().ScopeSelectorRegex;
     alignment.Selector = selector;
 
     if (useRegex)
         alignment.Finder = new RegexDelimiterFinder();
 
-    alignment.PerformAlignment(delimiter, 0, false);
+    let startIndex = 0;
+    if (fromCaret)
+    {
+        let position = vscode.window.activeTextEditor.selection.active;
+        startIndex   = position.character;
+    }
+
+    alignment.PerformAlignment(delimiter, startIndex, false);
 }
 
 function AlignByString()
@@ -51,11 +58,20 @@ function AlignByRegex()
 // your extension is activated the very first time the command is executed
 export function activate(context: vscode.ExtensionContext)
 {
-    context.subscriptions.push(vscode.commands.registerCommand('codealignment.alignbystring', AlignByString         ));
-    context.subscriptions.push(vscode.commands.registerCommand('codealignment.alignbyequals', () => doAlignment('=')));
-    context.subscriptions.push(vscode.commands.registerCommand('codealignment.alignbyperiod', () => doAlignment('.')));
-    context.subscriptions.push(vscode.commands.registerCommand('codealignment.alignbyquote',  () => doAlignment('"')));
-    context.subscriptions.push(vscode.commands.registerCommand('codealignment.alignbyregex',  AlignByRegex          ));
+    subscribeCommand(context, 'codealignment.alignbystring', AlignByString);
+    subscribeCommand(context, 'codealignment.alignbyregex',  AlignByRegex);
+
+    subscribeCommand(context, 'codealignment.alignbyequals',          () => doAlignment(' ='));
+    subscribeCommand(context, 'codealignment.alignbyequalsfromcaret', () => doAlignment(' =', false, true));
+    subscribeCommand(context, 'codealignment.alignbyperiod',          () => doAlignment('.', false, true));
+    subscribeCommand(context, 'codealignment.alignbyquote',           () => doAlignment('"'));
+    subscribeCommand(context, 'codealignment.alignbyquotefromcaret',  () => doAlignment('"', false, true));
+    subscribeCommand(context, 'codealignment.alignbyspace',           () => doAlignment("\\s[^\\s]", true, true));
+}
+
+function subscribeCommand(context: vscode.ExtensionContext, key: string, callback: (...args: any[]) => any)
+{
+    context.subscriptions.push(vscode.commands.registerCommand(key, callback));
 }
 
 export function deactivate()

src/implementation/Document.ts

@@ -18,12 +18,12 @@ export class Document implements IDocument
 
     public get StartSelectionLineNumber() : number
     {
-        return this.m_editor.selection.start.line;
+        return Math.min(...this.m_editor.selections.map(x => x.start.line));
     }
 
     public get EndSelectionLineNumber() : number
     {
-        return this.m_editor.selection.end.line;
+        return Math.max(...this.m_editor.selections.map(x => x.end.line));
     }
 
     public get CaretColumn() : number