Merge pull request #281 from mojavelinux/issue-280

resolves #280 use proper precedence when resolving style for token
rouge-ruby · Sep 10, 2015 · fc0fafd · fc0fafd
2 parents 76c96e8 + e100e86
commit fc0fafd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/rouge/theme.rb b/lib/rouge/theme.rb
@@ -84,7 +84,7 @@ def style(*tokens)
       end
 
       def get_own_style(token)
-        token.token_chain.each do |anc|
+        token.token_chain.reverse_each do |anc|
           return styles[anc] if styles[anc]
         end
 

diff --git a/spec/theme_spec.rb b/spec/theme_spec.rb
@@ -6,8 +6,8 @@ def squish(str)
   end
 
   class MyTheme < Rouge::CSSTheme
-    style Literal::String, :bold => true
-    style Literal::String::Backtick, :italic => true
+    style Literal::String, :fg => '#003366', :bold => true
+    style Literal::String::Backtick, :fg => '#555555', :italic => true
   end
 
   let(:theme) { MyTheme.new }
@@ -35,12 +35,17 @@ class MyTheme < Rouge::CSSTheme
   end
 
   it 'fetches a style for a token' do
-    bold = theme.style_for(Token['Literal.String'])
-    assert { bold == { :bold => true } }
+    style = theme.style_for(Rouge::Token['Literal.String'])
+    assert { style == { :fg => '#003366', :bold => true } }
   end
 
   it 'fetches a the closest style for a token' do
-    bold = theme.style_for(Token['Literal.String.Double'])
-    assert { bold == { :bold => true } }
+    style = theme.style_for(Rouge::Token['Literal.String.Backtick'])
+    assert { style == { :fg => '#555555', :italic => true } }
+  end
+
+  it 'fetches style from ancestor token when no style is defined' do
+    style = theme.style_for(Rouge::Token['Literal.String.Char'])
+    assert { style == { :fg => '#003366', :bold => true } }
   end
 end