ruco 0.2.0.beta9 → 0.2.0.beta10

data/VERSION

@@ -1 +1 @@
-0.2.0.beta9
+0.2.0.beta10

data/lib/ruco/editor/colors.rb

@@ -50,17 +50,27 @@ module Ruco
       def add_syntax_highlighting_to_style_map(map, syntax_info)
         syntax_info.each_with_index do |syntax_positions, line|
           next unless syntax_positions
+
           syntax_positions.each do |syntax_element, columns|
-            columns = columns.move(-@window.left)
-            columns = 0...columns.last if columns.first < 0 and columns.last > 0
-            style = style_for_syntax_element(syntax_element)
-            if style and columns.first >= 0
-              map.add(style, line, columns)
-            end
+            next unless style = style_for_syntax_element(syntax_element)
+            next unless columns = adjust_columns_to_window_position(columns, @window.left)
+            map.add(style, line, columns)
           end
         end
       end
 
+      def adjust_columns_to_window_position(columns, left)
+        return columns if left == 0
+
+        # style is out of scope -> add nothing
+        return nil if columns.last_element <= left
+
+        # shift style to the left
+        first = [0, columns.first - left].max
+        last = columns.last_element - left
+        first..last
+      end
+
       def style_for_syntax_element(syntax_element)
         @style_for_element ||= {}
         @style_for_element[syntax_element] ||= begin

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta9"
+  s.version = "0.2.0.beta10"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196369
+  hash: 62196375
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 9
-  version: 0.2.0.beta9
+  - 10
+  version: 0.2.0.beta10
 platform: ruby
 authors: 
 - Michael Grosser