better detection of erb

rubys · Mar 13, 2016 · 752763d · 752763d
1 parent c376929
commit 752763d
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/lib/gorp/edit.rb b/lib/gorp/edit.rb
@@ -41,14 +41,14 @@ def highlight
         # CSS
         start = '/* START_HIGHLIGHT */'
         close = '/* END_HIGHLIGHT */'
-      elsif self =~ /;\s*\}?$/
-        # JavaScript
-        start = '//#START_HIGHLIGHT'
-        close = '//#END_HIGHLIGHT'
-      elsif self =~ /->$/
-        # CoffeeScript
+      elsif self =~ /<%=/
+        # erb
         start = '#START_HIGHLIGHT'
         close = '#END_HIGHLIGHT'
+      elsif self =~ /;\s*\}?$/
+        # JavaScript
+        start = '// START_HIGHLIGHT'
+        close = '// END_HIGHLIGHT'
       else
         # Other, most likely Ruby
         start = '#START_HIGHLIGHT'
@@ -120,7 +120,7 @@ def dup
     end
 
     def clear_highlights
-      self.gsub! /^ *(\/\/#)\s*(START|END)_HIGHLIGHT\n/, ''
+      self.gsub! /^ *(\/\/#?)\s*(START|END)_HIGHLIGHT\n/, ''
       self.gsub! /^ *(#|<!--|\/\*)\s*(START|END)_HIGHLIGHT\s*?(-->|\*\/)?\n/, ''
     end