From 25735b2ee193df13eacb49e37211d4ef118b5b00 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 23 Sep 2015 10:01:39 +0200 Subject: [PATCH] Port autoscroll when selecting buffer ranges --- spec/text-editor-component-spec.coffee | 19 +++++++++++++++++++ spec/text-editor-spec.coffee | 24 ------------------------ 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee index 41778003c..686350e07 100644 --- a/spec/text-editor-component-spec.coffee +++ b/spec/text-editor-component-spec.coffee @@ -3393,6 +3393,25 @@ describe "TextEditorComponent", -> afterEach -> atom.themes.removeStylesheet("test") + describe "when selecting buffer ranges", -> + it "autoscrolls the selection if it is last unless the 'autoscroll' option is false", -> + expect(wrapperNode.getScrollTop()).toBe 0 + + editor.setSelectedBufferRange([[5, 6], [6, 8]]) + nextAnimationFrame() + expect(wrapperNode.getScrollBottom()).toBe (7 + editor.getVerticalScrollMargin()) * 10 + expect(wrapperNode.getScrollRight()).toBe (8 + editor.getHorizontalScrollMargin()) * 10 + + editor.setSelectedBufferRange([[0, 0], [0, 0]]) + nextAnimationFrame() + expect(wrapperNode.getScrollTop()).toBe 0 + expect(wrapperNode.getScrollLeft()).toBe 0 + + editor.setSelectedBufferRange([[6, 6], [6, 8]]) + nextAnimationFrame() + expect(wrapperNode.getScrollBottom()).toBe (7 + editor.getVerticalScrollMargin()) * 10 + expect(wrapperNode.getScrollRight()).toBe (8 + editor.getHorizontalScrollMargin()) * 10 + describe "when selecting lines containing cursors", -> it "autoscrolls to the selection", -> editor.setCursorScreenPosition([5, 6]) diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 63d4c403d..99b6b0544 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -1446,30 +1446,6 @@ describe "TextEditor", -> expect(selection1).toBe selection expect(selection1.getScreenRange()).toEqual [[2, 2], [3, 4]] - describe ".setSelectedBufferRange(range)", -> - it "autoscrolls the selection if it is last unless the 'autoscroll' option is false", -> - editor.setVerticalScrollMargin(2) - editor.setHorizontalScrollMargin(2) - editor.setLineHeightInPixels(10) - editor.setDefaultCharWidth(10) - editor.setHeight(70) - editor.setWidth(100) - editor.setHorizontalScrollbarHeight(0) - - expect(editor.getScrollTop()).toBe 0 - - editor.setSelectedBufferRange([[5, 6], [6, 8]]) - expect(editor.getScrollBottom()).toBe (7 + editor.getVerticalScrollMargin()) * 10 - expect(editor.getScrollRight()).toBe (8 + editor.getHorizontalScrollMargin()) * 10 - - editor.setSelectedBufferRange([[0, 0], [0, 0]]) - expect(editor.getScrollTop()).toBe 0 - expect(editor.getScrollLeft()).toBe 0 - - editor.setSelectedBufferRange([[6, 6], [6, 8]]) - expect(editor.getScrollBottom()).toBe (7 + editor.getVerticalScrollMargin()) * 10 - expect(editor.getScrollRight()).toBe (8 + editor.getHorizontalScrollMargin()) * 10 - describe ".selectMarker(marker)", -> describe "if the marker is valid", -> it "selects the marker's range and returns the selected range", ->