From f694d1d2c894319159743ee10b1ad4b79c6b380b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 10 Oct 2012 13:48:46 -0700 Subject: [PATCH] Update ruby bundle to commit 77dc5d13cc --- Rakefile | 2 +- spec/app/text-mate-grammar-spec.coffee | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index e85345c48..828c900a2 100644 --- a/Rakefile +++ b/Rakefile @@ -77,7 +77,7 @@ task "clone-default-bundles" => "create-dot-atom" do "https://github.com/textmate/html.tmbundle.git" => "HEAD", "https://github.com/textmate/javascript.tmbundle.git" => "HEAD", "https://github.com/textmate/ruby-on-rails.tmbundle.git" => "HEAD", - "https://github.com/textmate/ruby.tmbundle.git" => "f855d76db13d74a8bf7489f4a7722654685756ea" , + "https://github.com/textmate/ruby.tmbundle.git" => "77dc5d13ccb4feabca82dd8d9ed7889ec1061455" , "https://github.com/textmate/text.tmbundle.git" => "HEAD", "https://github.com/jashkenas/coffee-script-tmbundle.git" => "HEAD", "https://github.com/cburyta/puppet-textmate.tmbundle.git" => "HEAD", diff --git a/spec/app/text-mate-grammar-spec.coffee b/spec/app/text-mate-grammar-spec.coffee index d57cea966..c793dd386 100644 --- a/spec/app/text-mate-grammar-spec.coffee +++ b/spec/app/text-mate-grammar-spec.coffee @@ -12,7 +12,7 @@ describe "TextMateGrammar", -> describe ".getLineTokens(line, currentRule)", -> describe "when the entire line matches a single pattern with no capture groups", -> - it "returns a single token with the correct scope", -> + it "returns a single token with the correct scope", -> {tokens} = grammar.getLineTokens("return") expect(tokens.length).toBe 1 @@ -179,11 +179,11 @@ describe "TextMateGrammar", -> {tokens} = grammar.getLineTokens('%Q+matz had some #{%Q-crazy ideas-} for ruby syntax+ # damn.') expect(tokens[0]).toEqual value: '%Q+', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","punctuation.definition.string.begin.ruby"] expect(tokens[1]).toEqual value: 'matz had some ', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby"] - expect(tokens[2]).toEqual value: '#{', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","meta.embedded.line.ruby","punctuation.section.embedded.begin.ruby"] - expect(tokens[3]).toEqual value: '%Q-', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","meta.embedded.line.ruby","string.quoted.other.literal.upper.ruby","punctuation.definition.string.begin.ruby"] - expect(tokens[4]).toEqual value: 'crazy ideas', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","meta.embedded.line.ruby","string.quoted.other.literal.upper.ruby"] - expect(tokens[5]).toEqual value: '-', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","meta.embedded.line.ruby","string.quoted.other.literal.upper.ruby","punctuation.definition.string.end.ruby"] - expect(tokens[6]).toEqual value: '}', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","meta.embedded.line.ruby","punctuation.section.embedded.end.ruby","source.ruby"] # I'm not sure why it ends with source.ruby, but that is how the the ruby syntax specifies it + expect(tokens[2]).toEqual value: '#{', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","source.ruby.embedded.source","punctuation.section.embedded.ruby"] + expect(tokens[3]).toEqual value: '%Q-', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","source.ruby.embedded.source","string.quoted.other.literal.upper.ruby","punctuation.definition.string.begin.ruby"] + expect(tokens[4]).toEqual value: 'crazy ideas', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","source.ruby.embedded.source","string.quoted.other.literal.upper.ruby"] + expect(tokens[5]).toEqual value: '-', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","source.ruby.embedded.source","string.quoted.other.literal.upper.ruby","punctuation.definition.string.end.ruby"] + expect(tokens[6]).toEqual value: '}', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","source.ruby.embedded.source","punctuation.section.embedded.ruby"] expect(tokens[7]).toEqual value: ' for ruby syntax', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby"] expect(tokens[8]).toEqual value: '+', scopes: ["source.ruby","string.quoted.other.literal.upper.ruby","punctuation.definition.string.end.ruby"] expect(tokens[9]).toEqual value: ' ', scopes: ["source.ruby"]