From cdca9c3ef1b3b1a5f9adef9307abcbb62854ee7f Mon Sep 17 00:00:00 2001 From: Jess Lin Date: Mon, 20 Apr 2015 23:23:48 -0700 Subject: [PATCH] [Gutter] Fix coffeescript style issues --- spec/display-buffer-spec.coffee | 4 ++-- spec/gutter-container-component-spec.coffee | 14 +++++++------- spec/gutter-spec.coffee | 4 ++-- src/custom-gutter-component.coffee | 6 +++--- src/gutter-container-component.coffee | 4 ++-- src/gutter-container.coffee | 4 ++-- src/text-editor-presenter.coffee | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee index f37c9ebf0..23c4840bc 100644 --- a/spec/display-buffer-spec.coffee +++ b/spec/display-buffer-spec.coffee @@ -1373,7 +1373,7 @@ describe "DisplayBuffer", -> [marker] = [] beforeEach -> - marker = displayBuffer.markBufferRange([[1, 0], [1, 0]]); + marker = displayBuffer.markBufferRange([[1, 0], [1, 0]]) it "creates a decoration that is both of 'line-number' and 'gutter' type when called with the 'line-number' type", -> decorationProperties = {type: 'line-number', class: 'one'} @@ -1384,7 +1384,7 @@ describe "DisplayBuffer", -> expect(decoration.getProperties().class).toBe 'one' it "creates a decoration that is only of 'gutter' type if called with the 'gutter' type and a 'gutterName'", -> - decorationProperties = {type: 'gutter', gutterName:'test-gutter', class: 'one'} + decorationProperties = {type: 'gutter', gutterName: 'test-gutter', class: 'one'} decoration = displayBuffer.decorateMarker(marker, decorationProperties) expect(decoration.isType('gutter')).toBe true expect(decoration.isType('line-number')).toBe false diff --git a/spec/gutter-container-component-spec.coffee b/spec/gutter-container-component-spec.coffee index 1a286e522..218d8aae2 100644 --- a/spec/gutter-container-component-spec.coffee +++ b/spec/gutter-container-component-spec.coffee @@ -86,14 +86,14 @@ describe "GutterContainerComponent", -> expect(gutterContainerComponent.getDomNode().children.item(0)).toBe expectedCustomGutterNode it "removes a gutter from the DOM if it does not appear in the latest state update", -> - lineNumberGutter = new Gutter(mockGutterContainer, {name: 'line-number'}) - testState = buildTestState([{gutter: lineNumberGutter, visible: true}]) - gutterContainerComponent.updateSync(testState) + lineNumberGutter = new Gutter(mockGutterContainer, {name: 'line-number'}) + testState = buildTestState([{gutter: lineNumberGutter, visible: true}]) + gutterContainerComponent.updateSync(testState) - expect(gutterContainerComponent.getDomNode().children.length).toBe 1 - testState = buildTestState([]) - gutterContainerComponent.updateSync(testState) - expect(gutterContainerComponent.getDomNode().children.length).toBe 0 + expect(gutterContainerComponent.getDomNode().children.length).toBe 1 + testState = buildTestState([]) + gutterContainerComponent.updateSync(testState) + expect(gutterContainerComponent.getDomNode().children.length).toBe 0 describe "when updated with multiple gutters", -> it "positions (and repositions) the gutters to match the order they appear in each state update", -> diff --git a/spec/gutter-spec.coffee b/spec/gutter-spec.coffee index ba6933a05..30748b787 100644 --- a/spec/gutter-spec.coffee +++ b/spec/gutter-spec.coffee @@ -46,9 +46,9 @@ describe 'Gutter', -> [mockGutterContainer, mockGutterContainerRemovedGutters] = [] beforeEach -> - mockGutterContainerRemovedGutters = []; + mockGutterContainerRemovedGutters = [] mockGutterContainer = removeGutter: (destroyedGutter) -> - mockGutterContainerRemovedGutters.push destroyedGutter + mockGutterContainerRemovedGutters.push destroyedGutter it 'removes the gutter from its container.', -> gutter = new Gutter mockGutterContainer, {name} diff --git a/src/custom-gutter-component.coffee b/src/custom-gutter-component.coffee index ee4282860..380322e8b 100644 --- a/src/custom-gutter-component.coffee +++ b/src/custom-gutter-component.coffee @@ -32,7 +32,7 @@ class CustomGutterComponent newDimensionsAndBackgroundState = state.gutters setDimensionsAndBackground(@oldDimensionsAndBackgroundState, newDimensionsAndBackgroundState, @decorationsNode) - @oldDecorationPositionState ?= {}; + @oldDecorationPositionState ?= {} decorationState = state.gutters.customDecorations[@gutter.name] updatedDecorationIds = new Set @@ -59,7 +59,7 @@ class CustomGutterComponent # Builds and returns an HTMLElement to represent the specified decoration. buildDecorationNode: (decorationId, decorationInfo) -> - @oldDecorationPositionState[decorationId] = {}; + @oldDecorationPositionState[decorationId] = {} newNode = document.createElement('div') newNode.style.position = 'absolute' @updateDecorationNode(newNode, decorationId, decorationInfo) @@ -68,7 +68,7 @@ class CustomGutterComponent # Updates the existing HTMLNode with the new decoration info. Attempts to # minimize changes to the DOM. updateDecorationNode: (node, decorationId, newDecorationInfo) -> - oldPositionState = @oldDecorationPositionState[decorationId]; + oldPositionState = @oldDecorationPositionState[decorationId] if oldPositionState.top isnt newDecorationInfo.top + 'px' node.style.top = newDecorationInfo.top + 'px' diff --git a/src/gutter-container-component.coffee b/src/gutter-container-component.coffee index 097214556..e7fec35d5 100644 --- a/src/gutter-container-component.coffee +++ b/src/gutter-container-component.coffee @@ -72,7 +72,7 @@ class GutterContainerComponent existingGutterComponentDescription = @gutterComponents[indexInOldGutters] existingGutterComponent = existingGutterComponentDescription.component indexInOldGutters++ - if existingGutterComponent == gutterComponent + if existingGutterComponent is gutterComponent matchingGutterFound = true break if not matchingGutterFound @@ -82,7 +82,7 @@ class GutterContainerComponent @domNode.appendChild(gutterComponent.getDomNode()) else - if indexInOldGutters == oldGuttersLength + if indexInOldGutters is oldGuttersLength @domNode.appendChild(gutterComponent.getDomNode()) else @domNode.insertBefore(gutterComponent.getDomNode(), @domNode.children[indexInOldGutters]) diff --git a/src/gutter-container.coffee b/src/gutter-container.coffee index 075c15f60..db75daa27 100644 --- a/src/gutter-container.coffee +++ b/src/gutter-container.coffee @@ -30,7 +30,7 @@ class GutterContainer addGutter: (options) -> options = options ? {} gutterName = options.name - if gutterName == null + if gutterName is null throw new Error('A name is required to create a gutter.') if @gutterWithName(gutterName) throw new Error('Tried to create a gutter with a name that is already in use.') @@ -54,7 +54,7 @@ class GutterContainer gutterWithName: (name) -> for gutter in @gutters - if gutter.name == name then return gutter + if gutter.name is name then return gutter null ### diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee index 7e187615c..10e37ca9e 100644 --- a/src/text-editor-presenter.coffee +++ b/src/text-editor-presenter.coffee @@ -388,9 +388,9 @@ class TextEditorPresenter updateCommonGutterState: -> @state.gutters.backgroundColor = if @gutterBackgroundColor isnt "rgba(0, 0, 0, 0)" - @gutterBackgroundColor - else - @backgroundColor + @gutterBackgroundColor + else + @backgroundColor didAddGutter: (gutter) -> gutterDisposables = new CompositeDisposable