Merge branch 'master' into batch-updates

CHANGELOG.md

@@ -0,0 +1 @@
+See https://atom.io/releases

package.json

@@ -20,7 +20,7 @@
   "atomShellVersion": "0.21.0",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "^3.1.2",
+    "atom-keymap": "^3.1.3",
     "atom-space-pen-views": "^2.0.4",
     "babel-core": "^4.0.2",
     "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372",
@@ -93,8 +93,8 @@
     "dev-live-reload": "0.41.0",
     "encoding-selector": "0.18.0",
     "exception-reporting": "0.24.0",
-    "find-and-replace": "0.158.0",
-    "fuzzy-finder": "0.68.0",
+    "find-and-replace": "0.159.0",
+    "fuzzy-finder": "0.69.0",
     "git-diff": "0.54.0",
     "go-to-line": "0.30.0",
     "grammar-selector": "0.45.0",
@@ -109,14 +109,14 @@
     "package-generator": "0.38.0",
     "release-notes": "0.51.0",
     "settings-view": "0.183.0",
-    "snippets": "0.77.0",
+    "snippets": "0.78.0",
     "spell-check": "0.55.0",
     "status-bar": "0.60.0",
     "styleguide": "0.44.0",
-    "symbols-view": "0.85.0",
+    "symbols-view": "0.86.0",
     "tabs": "0.67.0",
     "timecop": "0.31.0",
-    "tree-view": "0.163.0",
+    "tree-view": "0.164.0",
     "update-package-dependencies": "0.8.0",
     "welcome": "0.24.0",
     "whitespace": "0.29.0",
@@ -132,7 +132,7 @@
     "language-html": "0.29.0",
     "language-hyperlink": "0.12.2",
     "language-java": "0.14.0",
-    "language-javascript": "0.59.0",
+    "language-javascript": "0.60.0",
     "language-json": "0.12.0",
     "language-less": "0.25.0",
     "language-make": "0.13.0",
@@ -142,9 +142,9 @@
     "language-php": "0.21.0",
     "language-property-list": "0.8.0",
     "language-python": "0.32.0",
-    "language-ruby": "0.48.0",
-    "language-ruby-on-rails": "0.19.0",
-    "language-sass": "0.34.0",
+    "language-ruby": "0.49.0",
+    "language-ruby-on-rails": "0.20.0",
+    "language-sass": "0.35.0",
     "language-shellscript": "0.12.0",
     "language-source": "0.9.0",
     "language-sql": "0.14.0",

spec/text-editor-component-spec.coffee

@@ -637,6 +637,18 @@ describe "TextEditorComponent", ->
           nextAnimationFrame()
           expect(lineNumberHasClass(5, 'folded')).toBe false
 
+        describe "when soft wrapping is enabled", ->
+          beforeEach ->
+            editor.setSoftWrapped(true)
+            nextAnimationFrame()
+            componentNode.style.width = 16 * charWidth + editor.getVerticalScrollbarWidth() + 'px'
+            component.measureHeightAndWidth()
+            nextAnimationFrame()
+
+          it "doesn't add the foldable class for soft-wrapped lines", ->
+            expect(lineNumberHasClass(0, 'foldable')).toBe true
+            expect(lineNumberHasClass(1, 'foldable')).toBe false
+
       describe "mouse interactions with fold indicators", ->
         [gutterNode] = []
 

src/gutter-component.coffee

@@ -122,10 +122,10 @@ class GutterComponent
       oldLineNumberState.top = newLineNumberState.top
       oldLineNumberState.screenRow = newLineNumberState.screenRow
 
-  buildLineNumberClassName: ({bufferRow, foldable, decorationClasses}) ->
+  buildLineNumberClassName: ({bufferRow, foldable, decorationClasses, softWrapped}) ->
     className = "line-number line-number-#{bufferRow}"
     className += " " + decorationClasses.join(' ') if decorationClasses?
-    className += " foldable" if foldable
+    className += " foldable" if foldable and not softWrapped
     className
 
   lineNumberNodeForScreenRow: (screenRow) ->