Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Do not tokenize escaped semicolons as comments #68

Merged
merged 1 commit into from
May 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grammars/clojure.cson
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
'repository':
'comment':
# NOTE: This must be kept as a begin/end match for language-todo to work
'begin': ';'
'begin': '(?<!\\\\);'
'beginCaptures':
'0':
'name': 'punctuation.definition.comment.clojure'
Expand Down
7 changes: 6 additions & 1 deletion spec/clojure-spec.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ describe "Clojure grammar", ->
expect(grammar).toBeDefined()
expect(grammar.scopeName).toBe "source.clojure"

it "tokenizes semi-colon comments", ->
it "tokenizes semicolon comments", ->
{tokens} = grammar.tokenizeLine "; clojure"
expect(tokens[0]).toEqual value: ";", scopes: ["source.clojure", "comment.line.semicolon.clojure", "punctuation.definition.comment.clojure"]
expect(tokens[1]).toEqual value: " clojure", scopes: ["source.clojure", "comment.line.semicolon.clojure"]

it "does not tokenize escaped semicolons as comments", ->
{tokens} = grammar.tokenizeLine "\\; clojure"
expect(tokens[0]).toEqual value: "\\; ", scopes: ["source.clojure"]
expect(tokens[1]).toEqual value: "clojure", scopes: ["source.clojure", "meta.symbol.clojure"]

it "tokenizes shebang comments", ->
{tokens} = grammar.tokenizeLine "#!/usr/bin/env clojure"
expect(tokens[0]).toEqual value: "#!", scopes: ["source.clojure", "comment.line.shebang.clojure", "punctuation.definition.comment.shebang.clojure"]
Expand Down