From 574158dc6d8afe9f559b0579b4450b31b5b82837 Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Fri, 27 Feb 2015 15:30:24 +0100 Subject: [PATCH 01/13] Add test for foldable icons on soft wrapped lines --- spec/text-editor-component-spec.coffee | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee index a830efe04..86aab0856 100644 --- a/spec/text-editor-component-spec.coffee +++ b/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] = [] From 09ed657c69d2e9adce831f374c46b2be897200ba Mon Sep 17 00:00:00 2001 From: Ivan Zuzak Date: Fri, 27 Feb 2015 15:30:49 +0100 Subject: [PATCH 02/13] Dont show foldable icon of soft wrapped lines --- src/gutter-component.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gutter-component.coffee b/src/gutter-component.coffee index 3209fe806..b6cb0c582 100644 --- a/src/gutter-component.coffee +++ b/src/gutter-component.coffee @@ -124,10 +124,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) -> From 0817d43914063d7e657ddd2694f818417136af2e Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Fri, 27 Feb 2015 08:16:16 -0800 Subject: [PATCH 03/13] :memo: Add CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..8823bd9cc --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1 @@ +See https://atom.io/releases From e0a73c32670e59aa458cbdb5b507cd900af89adb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 27 Feb 2015 08:57:34 -0800 Subject: [PATCH 04/13] :arrow_up: symbols-view@0.86 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1a50c58b0..f636ef7d7 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "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", From 44adf9537146c3c29712deed4baaafcf94987d7c Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 27 Feb 2015 10:12:05 -0700 Subject: [PATCH 05/13] :arrow_up: atom-keymap for delete key fix in Dvorak-Qwerty --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f636ef7d7..e62fb10c4 100644 --- a/package.json +++ b/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", From bfc5598eba4f817519babab69436366870820863 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 27 Feb 2015 09:38:19 -0800 Subject: [PATCH 06/13] :arrow_up: language-sass@0.35 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e62fb10c4..ea73719c4 100644 --- a/package.json +++ b/package.json @@ -144,7 +144,7 @@ "language-python": "0.32.0", "language-ruby": "0.48.0", "language-ruby-on-rails": "0.19.0", - "language-sass": "0.34.0", + "language-sass": "0.35.0", "language-shellscript": "0.12.0", "language-source": "0.9.0", "language-sql": "0.14.0", From c5121d2a6c135b856b11fca2b2570e9c12085f19 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 27 Feb 2015 09:44:57 -0800 Subject: [PATCH 07/13] :arrow_up: language-ruby-on-rails@0.20 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea73719c4..c7718fd9d 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "language-property-list": "0.8.0", "language-python": "0.32.0", "language-ruby": "0.48.0", - "language-ruby-on-rails": "0.19.0", + "language-ruby-on-rails": "0.20.0", "language-sass": "0.35.0", "language-shellscript": "0.12.0", "language-source": "0.9.0", From 0e5cae49316c35b050cec639e57b39073d6cb1ba Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 27 Feb 2015 09:45:24 -0800 Subject: [PATCH 08/13] :arrow_up: language-ruby@0.49 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c7718fd9d..ea203e0d1 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ "language-php": "0.21.0", "language-property-list": "0.8.0", "language-python": "0.32.0", - "language-ruby": "0.48.0", + "language-ruby": "0.49.0", "language-ruby-on-rails": "0.20.0", "language-sass": "0.35.0", "language-shellscript": "0.12.0", From 038162b68303e855f4f0cf039c82541bdc37592b Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 27 Feb 2015 10:40:16 -0800 Subject: [PATCH 09/13] :arrow_up: tree-view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ea203e0d1..0ee1a19d7 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "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", From 6f9b939abd1dbc671816eb8200e2041841d54117 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 27 Feb 2015 10:50:08 -0800 Subject: [PATCH 10/13] :arrow_up: fuzzy-finder --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0ee1a19d7..a0e6aa772 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "encoding-selector": "0.18.0", "exception-reporting": "0.24.0", "find-and-replace": "0.158.0", - "fuzzy-finder": "0.68.0", + "fuzzy-finder": "0.69.0", "git-diff": "0.54.0", "go-to-line": "0.30.0", "grammar-selector": "0.45.0", From e146be5baba9e3a36f506bb906fc2d8b232fb4b5 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 27 Feb 2015 11:08:41 -0800 Subject: [PATCH 11/13] :arrow_up: language-javascript@0.60 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0e6aa772..eddc8d5be 100644 --- a/package.json +++ b/package.json @@ -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", From 36ea47db99c7f3b66976cd6331edeb79d4cf462d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 27 Feb 2015 11:09:00 -0800 Subject: [PATCH 12/13] :arrow_up: find-and-replace --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eddc8d5be..4d360ac37 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "dev-live-reload": "0.41.0", "encoding-selector": "0.18.0", "exception-reporting": "0.24.0", - "find-and-replace": "0.158.0", + "find-and-replace": "0.159.0", "fuzzy-finder": "0.69.0", "git-diff": "0.54.0", "go-to-line": "0.30.0", From a3f64ddf7afdebfded53777638214e92b9f5937a Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 27 Feb 2015 13:14:52 -0700 Subject: [PATCH 13/13] :arrow_up: snippets for exception fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d360ac37..dbcedb53a 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "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",