From 07a2a6710d2dce5593a1d7644e31856d85635778 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 23 May 2014 16:15:24 -0700 Subject: [PATCH 1/4] Reload grammar in editor when path changes --- src/editor-view.coffee | 1 - src/editor.coffee | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/editor-view.coffee b/src/editor-view.coffee index 1d4d6a475..18f8a2427 100644 --- a/src/editor-view.coffee +++ b/src/editor-view.coffee @@ -547,7 +547,6 @@ class EditorView extends View @showBufferConflictAlert(@editor) @subscribe @editor, "path-changed", => - @editor.reloadGrammar() @trigger 'editor:path-changed' @subscribe @editor, "grammar-changed", => diff --git a/src/editor.coffee b/src/editor.coffee index 161a4455c..96bb72307 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -200,6 +200,8 @@ class Editor extends Model atom.project.setPath(path.dirname(@getPath())) @emit "title-changed" @emit "path-changed" + @reloadGrammar() + @subscribe @buffer, "contents-modified", => @emit "contents-modified" @subscribe @buffer, "contents-conflicted", => @emit "contents-conflicted" @subscribe @buffer, "modified-status-changed", => @emit "modified-status-changed" From 56eb1fc6e400fc92d83d4a4bd1c36d2989027dcf Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 23 May 2014 16:17:42 -0700 Subject: [PATCH 2/4] Reload grammar before emitting events --- src/editor.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor.coffee b/src/editor.coffee index 96bb72307..45e3c2a49 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -196,11 +196,11 @@ class Editor extends Model subscribeToBuffer: -> @buffer.retain() @subscribe @buffer, "path-changed", => + @reloadGrammar() unless atom.project.getPath()? atom.project.setPath(path.dirname(@getPath())) @emit "title-changed" @emit "path-changed" - @reloadGrammar() @subscribe @buffer, "contents-modified", => @emit "contents-modified" @subscribe @buffer, "contents-conflicted", => @emit "contents-conflicted" From b19126024a9c377095ce5247f7d195720ef7c66e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 23 May 2014 16:18:04 -0700 Subject: [PATCH 3/4] :lipstick: --- src/editor.coffee | 1 - 1 file changed, 1 deletion(-) diff --git a/src/editor.coffee b/src/editor.coffee index 45e3c2a49..1d1ab6d4b 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -201,7 +201,6 @@ class Editor extends Model atom.project.setPath(path.dirname(@getPath())) @emit "title-changed" @emit "path-changed" - @subscribe @buffer, "contents-modified", => @emit "contents-modified" @subscribe @buffer, "contents-conflicted", => @emit "contents-conflicted" @subscribe @buffer, "modified-status-changed", => @emit "modified-status-changed" From 4f2d935a1d97d8abf27e61519f3948583e4f7270 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 27 May 2014 08:55:40 -0700 Subject: [PATCH 4/4] Reload grammar on path changed in TokenizedBuffer --- src/editor.coffee | 1 - src/tokenized-buffer.coffee | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/editor.coffee b/src/editor.coffee index 1d1ab6d4b..161a4455c 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -196,7 +196,6 @@ class Editor extends Model subscribeToBuffer: -> @buffer.retain() @subscribe @buffer, "path-changed", => - @reloadGrammar() unless atom.project.getPath()? atom.project.setPath(path.dirname(@getPath())) @emit "title-changed" diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee index 6fc270f7a..01886ee0a 100644 --- a/src/tokenized-buffer.coffee +++ b/src/tokenized-buffer.coffee @@ -31,7 +31,9 @@ class TokenizedBuffer extends Model @on 'grammar-changed grammar-updated', => @resetTokenizedLines() @subscribe @buffer, "changed", (e) => @handleBufferChange(e) - @subscribe @buffer, "path-changed", => @bufferPath = @buffer.getPath() + @subscribe @buffer, "path-changed", => + @bufferPath = @buffer.getPath() + @reloadGrammar() @subscribe @$tabLength.changes, (tabLength) => lastRow = @buffer.getLastRow()