From a10863110e7c66ace332c83d0501d3061319e7db Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Mon, 11 Dec 2017 22:43:45 +0100 Subject: [PATCH 1/8] :arrow_up: snippets@1.1.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f4b1e1aa..3cafa0d59 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "open-on-github": "1.3.1", "package-generator": "1.3.0", "settings-view": "0.253.1", - "snippets": "1.1.10", + "snippets": "1.1.11", "spell-check": "0.72.4", "status-bar": "1.8.15", "styleguide": "0.49.10", From fb73df67b943710f1c499d800920035f7fec5321 Mon Sep 17 00:00:00 2001 From: Wliu <50Wliu@users.noreply.github.com> Date: Mon, 11 Dec 2017 23:05:22 +0100 Subject: [PATCH 2/8] :arrow_up: settings-view@0.253.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cafa0d59..2708a38f1 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "notifications": "0.70.2", "open-on-github": "1.3.1", "package-generator": "1.3.0", - "settings-view": "0.253.1", + "settings-view": "0.253.2", "snippets": "1.1.11", "spell-check": "0.72.4", "status-bar": "1.8.15", From ca53cf9ec1aed43edc05681029a23d379791586c Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 13 Dec 2017 09:17:30 -0800 Subject: [PATCH 3/8] Remove the texteditor isModified/isReadOnly handling intended for unsavable edit buffers as causes issues with vim-mode-plus --- spec/text-editor-spec.js | 17 ----------------- src/text-editor.js | 8 +------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/spec/text-editor-spec.js b/spec/text-editor-spec.js index 41a14f76a..89af72137 100644 --- a/spec/text-editor-spec.js +++ b/spec/text-editor-spec.js @@ -86,23 +86,6 @@ describe('TextEditor', () => { }) }) - describe('when the editor is readonly', () => { - it('overrides TextBuffer.isModified to return false', async () => { - const editor = await atom.workspace.open(null, {readOnly: true}) - editor.setText('I am altering the buffer, pray I do not alter it any further') - expect(editor.isModified()).toBe(false) - editor.setReadOnly(false) - expect(editor.isModified()).toBe(true) - }) - it('clears the readonly status when saved', async () => { - const editor = await atom.workspace.open(null, {readOnly: true}) - editor.setText('I am altering the buffer, pray I do not alter it any further') - expect(editor.isReadOnly()).toBe(true) - await editor.saveAs(temp.openSync('was-readonly').path) - expect(editor.isReadOnly()).toBe(false) - }) - }) - describe('.copy()', () => { it('returns a different editor with the same initial state', () => { expect(editor.getAutoHeight()).toBeFalsy() diff --git a/src/text-editor.js b/src/text-editor.js index c214ec0f6..4daca5d49 100644 --- a/src/text-editor.js +++ b/src/text-editor.js @@ -407,7 +407,6 @@ class TextEditor { if (this.component != null) { this.component.scheduleUpdate() } - this.buffer.emitModifiedStatusChanged(this.isModified()) } break @@ -568,11 +567,6 @@ class TextEditor { this.disposables.add(this.buffer.onDidChangeModified(() => { if (!this.hasTerminatedPendingState && this.buffer.isModified()) this.terminatePendingState() })) - this.disposables.add(this.buffer.onDidSave(() => { - if (this.isReadOnly()) { - this.setReadOnly(false) - } - })) } terminatePendingState () { @@ -1129,7 +1123,7 @@ class TextEditor { setEncoding (encoding) { this.buffer.setEncoding(encoding) } // Essential: Returns {Boolean} `true` if this editor has been modified. - isModified () { return this.isReadOnly() ? false : this.buffer.isModified() } + isModified () { return this.buffer.isModified() } // Essential: Returns {Boolean} `true` if this editor has no content. isEmpty () { return this.buffer.isEmpty() } From 6c89853cfd6259414f2b08827850dd99f3ef202f Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 13 Dec 2017 11:30:39 -0800 Subject: [PATCH 4/8] Try adding python 2.x back - newer Travis images dropped it --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 62040612a..7a5b3bd0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,6 +57,7 @@ addons: - fakeroot - git - libsecret-1-dev + - python - rpm - libx11-dev - libxkbfile-dev From d25760586a923adabcb155d27c504b51dde8c88d Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 13 Dec 2017 12:52:32 -0800 Subject: [PATCH 5/8] Try alternate way of getting right python --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7a5b3bd0b..e127aa499 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,8 @@ +language: python + +python: + - "2.7.13" + git: depth: 10 @@ -57,7 +62,6 @@ addons: - fakeroot - git - libsecret-1-dev - - python - rpm - libx11-dev - libxkbfile-dev From 2d6750cae323efd5284eeee5199a53075c577445 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 14 Dec 2017 11:56:23 +0100 Subject: [PATCH 6/8] Remove input enabled check for 'is-focused' class vim-mode-plus relies on this behavior --- src/text-editor-component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text-editor-component.js b/src/text-editor-component.js index 08af5ada1..263556ee0 100644 --- a/src/text-editor-component.js +++ b/src/text-editor-component.js @@ -823,7 +823,7 @@ class TextEditorComponent { const oldClassList = this.classList const newClassList = ['editor'] - if (this.focused && this.isInputEnabled()) newClassList.push('is-focused') + if (this.focused) newClassList.push('is-focused') if (model.isMini()) newClassList.push('mini') for (var i = 0; i < model.selections.length; i++) { if (!model.selections[i].isEmpty()) { From c6818c94d5de9fe4e6fd0638d77a2810a782f838 Mon Sep 17 00:00:00 2001 From: Katrina Uychaco Date: Thu, 14 Dec 2017 11:57:01 +0100 Subject: [PATCH 7/8] :arrow_up: github@0.9.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2708a38f1..7a229d4c5 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "exception-reporting": "0.42.0", "find-and-replace": "0.215.0", "fuzzy-finder": "1.7.4", - "github": "0.9.0", + "github": "0.9.1", "git-diff": "1.3.7", "go-to-line": "0.32.1", "grammar-selector": "0.49.9", From bba2c474c47c17ebf90c2f0feac674a1b562a3d0 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 14 Dec 2017 15:31:27 -0800 Subject: [PATCH 8/8] :arrow_up: autoflow --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a229d4c5..2a9374db3 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "autocomplete-html": "0.8.4", "autocomplete-plus": "2.39.1", "autocomplete-snippets": "1.11.2", - "autoflow": "0.29.0", + "autoflow": "0.29.1", "autosave": "0.24.6", "background-tips": "0.27.1", "bookmarks": "0.45.1",