jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More haml work

Browse source
This commit is contained in:
Garen Torikian 2012-11-11 22:22:28 -08:00 • committed by nightwing
commit c5a3cac12f
3 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
demo/kitchen-sink/docs/haml.haml
View file

@ -5,20 +5,15 @@
-# <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]--> -# <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
-# <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> -# <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
# file: app/controllers/movies_controller.rb
class MoviesController < ApplicationController
def index
@title = "Teen Wolf"
end
end
/adasdasdad /adasdasdad
%div{:id => "#{@item.type}_#{@item.number}", :class => "#{@item.type} #{@item.urgency}"} %div{:id => "#{@item.type}_#{@item.number}", :class => "#{@item.type} #{@item.urgency}"}
-# file: app/views/movies/index.html.haml -# file: app/views/movies/index.html.haml
\d \d
%ads:
%p==ddd== %p==ddd==
Date/Time: Date/Time:
- now = DateTime.now - now = DateTime.now
%strong= now %strong= now
- if now > DateTime.parse("December 31, 2006") - if now > DateTime.parse("December 31, 2006")
= "Happy new " + "year!" = "Happy new " + "year!"
@ -28,6 +23,7 @@ end
%h1= @title %h1= @title
= link_to 'Home', home_url = link_to 'Home', home_url
#contents
%div#content %div#content
%div.articles %div.articles
%div.article.title Blah %div.article.title Blah

28
lib/ace/mode/haml_highlight_rules.js
View file

@ -76,9 +76,9 @@ var HamlHighlightRules = function() {
// "regex": "^( *)(/)\\s*$", // "regex": "^( *)(/)\\s*$",
// "next": "state_4" // "next": "state_4"
//}, //},
{ {
"token": ["meta.tag.haml", "punctuation.definition.tag.haml", "entity.name.tag.haml"], "token": ["entity.name.tag.haml"],
"regex": /^\s*(?:((%)([\w:]+))|(?=\.|#))/, "regex": /^\s*%[\w:]+/,
"next": "tag_single" "next": "tag_single"
}, },
{ {
@ -154,17 +154,17 @@ var HamlHighlightRules = function() {
],*/ ],*/
"tag_single": [ "tag_single": [
{ {
"token": "suport.type.attribute.class.jade", "token": "entity.other.attribute-name.class.haml",
"regex": "\\.[\\w-]+" "regex": "\\.[\\w-]+"
}, },
{ {
"token": "suport.type.attribute.id.jade", "token": "entity.other.attribute-name.id.haml",
"regex": "#[\\w-]+" "regex": "#[\\w-]+"
}, },
//{ {
// "token": "meta.section.attributes.haml", "token": "meta.section.attributes.haml",
// "regex": "" "regex": "\\{(?=.*\\}|.*\\|\\s*$)"
//}, },
//{ //{
// "token": "meta.section.object.haml", // "token": "meta.section.object.haml",
// "regex": "" // "regex": ""
@ -176,11 +176,11 @@ var HamlHighlightRules = function() {
// "token": "punctuation.terminator.tag.haml", // "token": "punctuation.terminator.tag.haml",
// "regex": "/" // "regex": "/"
//}, //},
//{ {
// "token": "TODO", "token": ["text", "punctuation"],
// "regex": "$|(?!\\.|#|\\{|\\[|=|-|~|/)", "regex": "($)|((?!\\.|#|=|-))",
// "next": "start" "next": "start"
//} }
]/*, ]/*,
"state_7": [ "state_7": [
{ {

4
lib/ace/mode/jade_highlight_rules.js
View file

@ -206,11 +206,11 @@ var JadeHighlightRules = function() {
],*/ ],*/
"tag_single": [ "tag_single": [
{ {
"token": "suport.type.attribute.class.jade", "token": "entity.other.attribute-name.class.jade",
"regex": "\\.[\\w-]+" "regex": "\\.[\\w-]+"
}, },
{ {
"token": "suport.type.attribute.id.jade", "token": "entity.other.attribute-name.id.jade",
"regex": "#[\\w-]+" "regex": "#[\\w-]+"
}, },
{ {