Browse Source

Move <script> Javascript highlighting from java.java(script) to js.js(html)

pull/3/head
cn 8 years ago
parent
commit
f17483d34f
3 changed files with 18 additions and 7 deletions
  1. +1
    -1
      html.jsf
  2. +0
    -5
      java.jsf
  3. +17
    -1
      js.jsf

+ 1
- 1
html.jsf View File

@@ -174,7 +174,7 @@ done
.ifdef php
* tag_begin call=php.php(script)
.else
* tag_begin call=java.java(script)
* tag_begin call=js.js(html)
.endif

:stag_done TagEdge


+ 0
- 5
java.jsf View File

@@ -37,12 +37,7 @@
"'" char recolor=-1
"a-zA-Z_" ident mark buffer
"{}" brace recolor=-1
.ifdef script
",:;=()>[]*&|!~+\-%^" control recolor=-1
"<" maybe_done
.else
",:;=()><[]*&|!~+\-%^" control recolor=-1
.endif

:maybe_done Control
* idle noeat


+ 17
- 1
js.jsf View File

@@ -21,6 +21,11 @@
=Methods
=Number cyan #fg_520 # orange

:begin Idle
* begin noeat call=.js()

.subr js

:idle Idle
* idle
"\n" idle
@@ -32,7 +37,12 @@
"'" char recolor=-1
"a-zA-Z_" ident mark buffer
"{}" brace recolor=-1
",:;=()><[]*&|!?~+\-%^" control recolor=-1
.ifdef html
",:;=()>[]*&|!?~+\-%^" control recolor=-1
"<" maybe_done
.else
",:;=()><[]*&|!?~+\-%^" control recolor=-1
.endif

# / / regex not allowed after terms
# class Control to handle ')' right
@@ -42,6 +52,10 @@
"%" control recolor=-1
"/" after_term_slash

:maybe_done Control
* idle noeat
"/" idle noeat return recolor=-2

:brace Brace
* idle noeat

@@ -259,6 +273,8 @@ done
:method_end Methods
* idle noeat

.end

.subr comment_todo
# initial state
:comment_todo_init Comment


Loading…
Cancel
Save