Merge pull request #884 from dirk-thomas/context_spec

Add spec for context lines

Author: Max Brunsfeld

lib/project/match-view.js

@@ -68,7 +68,7 @@ class MatchView {
           leadingContextLines ? leadingContextLines.map((line, index) =>
             $.li({className: 'list-item'},
               $.span({className: 'line-number text-subtle'}, range.start.row + 1 - leadingContextLines.length + index),
-              $.span({className: 'preview'}, $.span({}, line))
+              $.span({className: 'preview'}, $.span({}, line.trimLeft()))
             )
           ) : null,
 
@@ -92,7 +92,7 @@ class MatchView {
           trailingContextLines ? trailingContextLines.map((line, index) =>
             $.li({className: 'list-item'},
               $.span({className: 'line-number text-subtle'}, range.end.row + 1 + index + 1),
-              $.span({className: 'preview'}, $.span({}, line))
+              $.span({className: 'preview'}, $.span({}, line.trimLeft()))
             )
           ) : null
         )

lib/project/results-model.coffee

@@ -247,6 +247,8 @@ class ResultsModel
     return unless editor.getPath()
 
     matches = []
+    # the following condition is pretty hacky
+    # it doesn't work correctly for e.g. version 1.2
     if parseFloat(atom.getVersion()) >= 1.17
       leadingContextLineCount = atom.config.get('find-and-replace.searchContextLineCountBefore')
       trailingContextLineCount = atom.config.get('find-and-replace.searchContextLineCountAfter')

spec/results-model-spec.js

@@ -10,6 +10,8 @@ describe("ResultsModel", () => {
 
   beforeEach(async () => {
     atom.config.set("core.excludeVcsIgnoredPaths", false);
+    atom.config.set("find-and-replace.searchContextLineCountBefore", 2);
+    atom.config.set("find-and-replace.searchContextLineCountAfter", 3);
     atom.project.setPaths([path.join(__dirname, "fixtures")]);
 
     editor = await atom.workspace.open("sample.js");
@@ -33,6 +35,18 @@ describe("ResultsModel", () => {
       expect(resultsModel.getPathCount()).toBe(1);
       expect(resultsModel.getMatchCount()).toBe(6);
       expect(resultsModel.getPaths()).toEqual([editor.getPath()]);
+      // the following condition is pretty hacky
+      // it doesn't work correctly for e.g. version 1.2
+      if (parseFloat(atom.getVersion()) >= 1.17) {
+        expect(result.matches[0].leadingContextLines.length).toBe(1);
+        expect(result.matches[0].leadingContextLines[0]).toBe("var quicksort = function () {");
+        expect(result.matches[0].trailingContextLines.length).toBe(3);
+        expect(result.matches[0].trailingContextLines[0]).toBe("    if (items.length <= 1) return items;");
+        expect(result.matches[0].trailingContextLines[1]).toBe("    var pivot = items.shift(), current, left = [], right = [];");
+        expect(result.matches[0].trailingContextLines[2]).toBe("    while(items.length > 0) {");
+        expect(result.matches[5].leadingContextLines.length).toBe(2);
+        expect(result.matches[5].trailingContextLines.length).toBe(3);
+      }
 
       editor.setText("there are some items in here");
       advanceClock(editor.buffer.stoppedChangingDelay);
@@ -44,6 +58,12 @@ describe("ResultsModel", () => {
       expect(resultsModel.getMatchCount()).toBe(1);
       expect(resultsModel.getPaths()).toEqual([editor.getPath()]);
       expect(result.matches[0].lineText).toBe("there are some items in here");
+      // the following condition is pretty hacky
+      // it doesn't work correctly for e.g. version 1.2
+      if (parseFloat(atom.getVersion()) >= 1.17) {
+        expect(result.matches[0].leadingContextLines.length).toBe(0);
+        expect(result.matches[0].trailingContextLines.length).toBe(0);
+      }
 
       editor.setText("no matches in here");
       advanceClock(editor.buffer.stoppedChangingDelay);

spec/results-view-spec.js

@@ -692,6 +692,43 @@ describe('ResultsView', () => {
       atom.commands.dispatch(projectFindView.element, 'core:confirm');
       expect(resultsPane.refs.previewCount.textContent).toContain('Project search results');
     })
+  });
+
+  describe('search result context lines', () => {
+    beforeEach(async () => {
+      atom.config.set('find-and-replace.searchContextLineCountBefore', 2);
+      atom.config.set('find-and-replace.searchContextLineCountAfter', 3);
+
+      projectFindView.findEditor.setText('items');
+      atom.commands.dispatch(projectFindView.element, 'core:confirm');
+      await searchPromise;
+
+      resultsView = getResultsView();
+    });
+
+    it('shows the context lines', async () => {
+      // the following condition is pretty hacky
+      // it doesn't work correctly for e.g. version 1.2
+      if (parseFloat(atom.getVersion()) >= 1.17) {
+        const pathNodes = resultsView.refs.listView.element.querySelectorAll('.path');
+        expect(pathNodes.length).toBe(1)
+        const pathNameNode = pathNodes[0].querySelector('.path-name');
+        expect(pathNameNode.textContent).toBe('sample.coffee');
+        const resultNode = pathNodes[0].querySelector('.search-result');
+        const lineNodes = resultNode.querySelectorAll('.list-item');
+        expect(lineNodes.length).toBe(5)
+        expect(lineNodes[0]).not.toHaveClass('match-line');
+        expect(lineNodes[0].querySelector('.preview').textContent).toBe('class quicksort');
+        expect(lineNodes[1]).toHaveClass('match-line');
+        expect(lineNodes[1].querySelector('.preview').textContent).toBe('sort: (items) ->');
+        expect(lineNodes[2]).not.toHaveClass('match-line');
+        expect(lineNodes[2].querySelector('.preview').textContent).toBe('return items if items.length <= 1');
+        expect(lineNodes[3]).not.toHaveClass('match-line');
+        expect(lineNodes[3].querySelector('.preview').textContent).toBe('');
+        expect(lineNodes[4]).not.toHaveClass('match-line');
+        expect(lineNodes[4].querySelector('.preview').textContent).toBe('pivot = items.shift()');
+      }
+    });
   })
 });