git-plus overwrites the source.diff grammar of language-diff

[stesachse]

disable syntaxHighlighting in settings and restart atom.

after atom is restarted, open the developer tools and run the following code inside the console.

var XXX_get = function() {return atom.grammars.grammarForScopeName('source.diff')};
var XXX_say = function() {var g = XXX_get(); console.log('name:%s, package:%s, path:%s', g.name, g.packageName, g.path);};
XXX_say()

the expected output is as follows:

name:Diff, package:language-diff, path:~/.atom/packages/language-diff/grammars/diff.cson

now open a new empty file and run XXX_say() in the console. the output should be the same as in first run. next open the grammar selector and type diff but do not yet change the grammar! there should be two entries in the selector. Diff and Line Diff. Diff is from language-diff and Line Diff is from git-plus. change into the console and run XXX_say() again. as before, the output is correct. now change the grammar and check the console. output should as expected. the grammar is now Diff, the file is still empty and unsaved. save the empty file somewhere and watch the grammar indicator inside the status bar. immediately after save the grammar automatically changes to Line Diff and i got this as output in the console

name:Line Diff, package:git-plus, path:~/.atom/packages/git-plus/lib/grammars/line-diff.json

run XXX_get() to dump the entire Grammar object.

the grammar selector now has two Line Diff entries.

maybe the problem is the onPathsChanged() callback function. after saving the file, atom opens the tree view with the directory of the file as root. onPathsChanged() calls @deactivate() and @activate(). @activate() calls setDiffGrammar() which removes all grammars for source.diff and enables his own Line Diff grammar if syntaxHighlighting is disabled.

this patch moves the code that removes the grammars some lines down into the if condition where the new grammar is added. the else condition to reload the grammar is not longer needed. because nothing is removed if syntaxHighlighting is not enabled.

diff --git a/git-plus/lib/git-plus.coffee b/git-plus/lib/git-plus.coffee
index 79a336a..7e2433b 100644
--- a/git-plus/lib/git-plus.coffee
+++ b/home/white/.atom/packages/git-plus/lib/git-plus.coffee
@@ -60,9 +60,6 @@ currentFile = (repo) ->
   repo.relativize(atom.workspace.getActiveTextEditor()?.getPath())
 
 setDiffGrammar = ->
-  while atom.grammars.grammarForScopeName 'source.diff'
-    atom.grammars.removeGrammarForScopeName 'source.diff'
-
   enableSyntaxHighlighting = atom.config.get('git-plus.diffs.syntaxHighlighting')
   wordDiff = atom.config.get('git-plus.diffs.wordDiff')
   diffGrammar = null
@@ -76,11 +73,9 @@ setDiffGrammar = ->
     baseGrammar = baseLineGrammar
 
   if enableSyntaxHighlighting
+    while atom.grammars.grammarForScopeName 'source.diff'
+      atom.grammars.removeGrammarForScopeName 'source.diff'
     atom.grammars.addGrammar diffGrammar
-  else
-    grammar = atom.grammars.readGrammarSync baseGrammar
-    grammar.packageName = 'git-plus'
-    atom.grammars.addGrammar grammar
 
 getWorkspaceRepos = -> atom.project.getRepositories().filter (r) -> r?
 

works for me (atom is packaged from copr mosquito/atom)

apm list -b | grep -e language-diff -e git-plus

[email protected] [email protected]

atom --version

Atom : 1.15.0 Electron: 1.3.13 Chrome : 52.0.2743.82 Node : 6.5.0

lsb_release -s -d

"Fedora release 25 (Twenty Five)"

[akonwi]

Thanks for the info. Perhaps you should create a pull request with those changes