refs #16 Sort selections by line number

Author: ryu1kn

lib/command-factory.js

@@ -5,8 +5,6 @@ const CompareSelectionWithClipboardCommand = require('./commands/compare-selecti
 const TextTitleBuilder = require('./text-title-builder');
 const Clipboard = require('./clipboard');
 const DiffPresenter = require('./diff-presenter');
-const EditorLineRangeExtractor = require('./editor-line-range-extractor');
-const EditorTextExtractor = require('./editor-text-extractor');
 const SelectionInfoBuilder = require('./selection-info-builder');
 const clipboardy = require('clipboardy');
 
@@ -57,7 +55,7 @@ class CommandFactory {
     }
 
     _getSelectionInfoBuilder() {
-        this._selectionInfoBuilder = this._selectionInfoBuilder || this._createSelectionInfoBuilder();
+        this._selectionInfoBuilder = this._selectionInfoBuilder || new SelectionInfoBuilder();
         return this._selectionInfoBuilder;
     }
 
@@ -77,13 +75,6 @@ class CommandFactory {
         });
     }
 
-    _createSelectionInfoBuilder() {
-        return new SelectionInfoBuilder({
-            editorLineRangeExtractor: new EditorLineRangeExtractor(),
-            editorTextExtractor: new EditorTextExtractor()
-        });
-    }
-
 }
 
 module.exports = CommandFactory;

lib/editor-line-range-extractor.js

@@ -3,19 +3,36 @@ const path = require('path');
 
 class SelectionInfoBuilder {
 
-    constructor(params) {
-        this._editorTextExtractor = params.editorTextExtractor;
-        this._editorLineRangeExtractor = params.editorLineRangeExtractor;
-    }
-
     extract(editor) {
+        const validSelections = this._collectNonEmptySelections(editor.selections);
+        const extractText = selection => editor.document.getText(selection);
+
         return {
-            text: this._editorTextExtractor.extract(editor),
+            text: this._extractText(validSelections, extractText),
             fileName: path.basename(editor.document.fileName),
-            lineRanges: this._editorLineRangeExtractor.extract(editor)
+            lineRanges: this._extractLineRanges(validSelections)
         };
     }
 
+    _collectNonEmptySelections(selections) {
+        return selections
+            .filter(s => !s.isEmpty)
+            .sort((s1, s2) => s1.start.line - s2.start.line);
+    }
+
+    _extractText(selections, extractText) {
+        return selections.length === 0 ?
+            extractText() :
+            selections.map(extractText).join('\n');
+    }
+
+    _extractLineRanges(selections) {
+        return selections.map(selection => ({
+            start: selection.start.line,
+            end: selection.end.line
+        }));
+    }
+
 }
 
 module.exports = SelectionInfoBuilder;

lib/editor-text-extractor.js

@@ -1,7 +1,5 @@
 
 const SelectionInfoBuilder = require('../../lib/selection-info-builder');
-const EditorTextExtractor = require('../../lib/editor-text-extractor');
-const EditorLineRangeExtractor = require('../../lib/editor-line-range-extractor');
 
 suite('SelectionInfoBuilder', () => {
 
@@ -56,25 +54,39 @@ suite('SelectionInfoBuilder', () => {
         ]);
     });
 
+    test('it sorts the selections by ascending order of line number', () => {
+        const selections = [
+            {start: {line: 5}, end: {line: 6}},
+            {start: {line: 1}, end: {line: 2}}
+        ];
+        const textInfo = extractTextInfoFromSelections(selections);
+        expect(textInfo.lineRanges).to.eql([
+            {start: 1, end: 2},
+            {start: 5, end: 6}
+        ]);
+    });
+
     test('it extracts a file name from editor', () => {
         const textInfo = extractTextInfo(['SELECTED_TEXT']);
         expect(textInfo).to.include({fileName: 'FILENAME'});
     });
 
     function extractTextInfo(selectedTexts) {
-        const editorTextExtractor = new EditorTextExtractor();
-        const editorLineRangeExtractor = new EditorLineRangeExtractor();
-        const selectionInfoBuilder = new SelectionInfoBuilder({editorTextExtractor, editorLineRangeExtractor});
-        return selectionInfoBuilder.extract(fakeEditor(selectedTexts));
-    }
-
-    function fakeEditor(selectedTexts) {
         const selections = selectedTexts.map((text, i) => ({
             text,
             start: {line: `START_LINE_${i + 1}`},
             end: {line: `END_LINE_${i + 1}`},
             isEmpty: !text
         }));
+        return extractTextInfoFromSelections(selections);
+    }
+
+    function extractTextInfoFromSelections(selections) {
+        const selectionInfoBuilder = new SelectionInfoBuilder();
+        return selectionInfoBuilder.extract(fakeEditor(selections));
+    }
+
+    function fakeEditor(selections) {
         return {
             selections,
             selection: selections[0],