Merge pull request #2405 from github/fix-handlebars-grammar

Fix Handlebars grammar
This commit is contained in:
Arfon Smith
2015-05-19 10:46:21 -05:00

View File

@@ -188,14 +188,16 @@ def load_grammars(tmp_dir, source, all_scopes)
scope = grammar['scopeName'] scope = grammar['scopeName']
if all_scopes.key?(scope) if all_scopes.key?(scope)
$stderr.puts "WARN: Duplicated scope #{scope}\n" + unless all_scopes[scope] == p.url
" Current package: #{p.url}\n" + $stderr.puts "WARN: Duplicated scope #{scope}\n" +
" Previous package: #{all_scopes[scope]}" " Current package: #{p.url}\n" +
" Previous package: #{all_scopes[scope]}"
end
next next
end end
all_scopes[scope] = p.url all_scopes[scope] = p.url
grammar grammar
end end.compact
end end
def install_grammars(grammars, path) def install_grammars(grammars, path)