Reverted 7a61e2c..4132f85 . Moved into branch multiline-string-highlighting.
This commit is contained in:
Pistos
parent
4132f852cc
commit
92ae2f386d
4 changed files with 39 additions and 61 deletions
|
|
@ -10,7 +10,6 @@ Contributors: Pistos
|
|||
- Ruby version now enforced, both at installation and run time.
|
||||
- Input line can now scroll if input is longer than screen width.
|
||||
- Added support for session completion in zsh and bash.
|
||||
- Improved syntax definitions for regular expressions and quoted strings.
|
||||
- Various refactorings.
|
||||
- Various bug fixes.
|
||||
|
||||
|
|
|
|||
|
|
@ -52,14 +52,14 @@ lang.ruby.tokens.regular_expressions.format = lang.shared.tokens.regular_express
|
|||
lang.ruby.tokens.singlequoted_strings.format = lang.shared.tokens.singlequoted_strings.format
|
||||
lang.ruby.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.ruby.tokens.backquoted_strings.format = lang.shared.tokens.backquoted_strings.format
|
||||
lang.ruby.tokens.interpolated_string.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.interpolated_ruby.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.ruby.tokens.modifiers.format 44
|
||||
lang.ruby.tokens.symbols.format 34
|
||||
lang.ruby.tokens.hash_keys.format 34
|
||||
lang.ruby.tokens.instance_variables.format 35
|
||||
lang.ruby.tokens.regular_expressions2.format 36
|
||||
lang.interpolated_ruby.tokens.interpolation.format 33
|
||||
lang.ruby.tokens.interpolated_string.format 38
|
||||
lang.interpolated_ruby.format.default 38
|
||||
lang.interpolated_ruby.tokens.interpolation.format 12 bold
|
||||
lang.ruby.tokens.interpolated_exec_string.format 39
|
||||
lang.interpolated_exec_ruby.format.default 39
|
||||
lang.interpolated_exec_ruby.tokens.interpolation.format 9 bold
|
||||
|
|
@ -79,7 +79,6 @@ lang.perl.tokens.non_alphanum.format = lang.shared.tokens.non_alphanum.format
|
|||
lang.perl.tokens.regular_expressions.format = lang.shared.tokens.regular_expressions.format
|
||||
lang.perl.tokens.singlequoted_strings.format = lang.shared.tokens.singlequoted_strings.format
|
||||
lang.perl.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.perl_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.perl.tokens.backquoted_strings.format = lang.shared.tokens.backquoted_strings.format
|
||||
lang.perl.tokens.builtins.format cyan bold
|
||||
lang.perl.tokens.array_variables.format red bold
|
||||
|
|
@ -91,8 +90,7 @@ lang.java.format.default = lang.shared.format.default
|
|||
lang.java.format.selection = lang.shared.format.selection
|
||||
lang.java.format.found = lang.shared.format.found
|
||||
lang.java.tokens.singlequoted_strings.format 37
|
||||
lang.java.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.java_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.java.tokens.doublequoted_strings.format 38
|
||||
lang.java.tokens.reserved_words.format white
|
||||
lang.java.tokens.constants.format = lang.shared.tokens.constants.format
|
||||
lang.java.tokens.comments.format = lang.shared.tokens.comments.format
|
||||
|
|
@ -112,8 +110,8 @@ lang.xml.tokens.template.format brown
|
|||
lang.xml_tag.format.default 41
|
||||
lang.xml_tag.format.selection 32
|
||||
lang.xml_tag.format.found yellow inverse
|
||||
lang.xml_tag.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.xml_tag.tokens.singlequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.xml_tag.tokens.doublequoted_strings.format 38
|
||||
lang.xml_tag.tokens.singlequoted_strings.format 38
|
||||
lang.xml_tag.tokens.non_alphanum.format = lang.shared_tag.tokens.non_alphanum.format
|
||||
lang.xml_tag.tokens.namespaces.format 43
|
||||
lang.xml_comment.format.default = lang.shared.tokens.comments.format
|
||||
|
|
@ -139,7 +137,6 @@ lang.php.format.selection = lang.shared.format.selection
|
|||
lang.php.format.found = lang.shared.format.found
|
||||
lang.php.tokens.singlequoted_strings.format = lang.shared.tokens.singlequoted_strings.format
|
||||
lang.php.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.php_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.php.tokens.reserved_words.format = lang.shared.tokens.reserved_words.format
|
||||
lang.php.tokens.constants.format = lang.shared.tokens.constants.format
|
||||
lang.php.tokens.comments.format = lang.shared.tokens.comments.format
|
||||
|
|
|
|||
|
|
@ -560,10 +560,6 @@ lang.shared.tokens.singlequoted_strings.format green bold
|
|||
lang.shared.tokens.doublequoted_strings.format green bold
|
||||
lang.shared.tokens.backquoted_strings.format red bold
|
||||
|
||||
lang.shared.tokens.singlequoted_strings ('.*?(?<!\\)')
|
||||
lang.shared.tokens.regular_expressions (/.*?(?<!\\)/)
|
||||
lang.shared.tokens.backquoted_strings (`.*?(?<!\\)`)
|
||||
|
||||
# Text (default)
|
||||
|
||||
lang.text.format.default white
|
||||
|
|
@ -637,7 +633,7 @@ lang.xml_tag.indent.roundup true
|
|||
#lang.xml_tag.indent.using_tabs true
|
||||
lang.xml_tag.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.xml_tag.tokens.doublequoted_strings.format green bold
|
||||
lang.xml_tag.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.xml_tag.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.xml_tag.tokens.singlequoted_strings.format green bold
|
||||
lang.xml_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
|
||||
lang.xml_tag.tokens.non_alphanum.format white
|
||||
|
|
@ -709,7 +705,7 @@ lang.html_tag.tokens.attributes.case_insensitive \b(abbr|accept-charset|accept|a
|
|||
lang.html_tag.tokens.attributes.format white
|
||||
lang.html_tag.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.html_tag.tokens.doublequoted_strings.format green bold
|
||||
lang.html_tag.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.html_tag.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.html_tag.tokens.singlequoted_strings.format green bold
|
||||
lang.html_tag.tokens.non_alphanum ([@!#$%^&*()\[\]{}/?=+\-\\|,<.>;:])
|
||||
lang.html_tag.tokens.non_alphanum.format white
|
||||
|
|
@ -791,26 +787,24 @@ lang.ruby.tokens.sql_string.format 1
|
|||
lang.ruby.tokens.sql_string.change_to sql
|
||||
lang.ruby.tokens.instance_variables (@[A-Za-z_][A-Za-z_0-9]*)
|
||||
lang.ruby.tokens.instance_variables.format white bold
|
||||
lang.ruby.tokens.regular_expressions = lang.shared.tokens.regular_expressions
|
||||
lang.ruby.tokens.regular_expressions (\/.+?[^\\]\/)
|
||||
lang.ruby.tokens.regular_expressions.format red bold
|
||||
lang.ruby.tokens.regular_expressions2 (%r\{.+?[^\}]\})
|
||||
lang.ruby.tokens.regular_expressions2.format red bold
|
||||
lang.ruby.tokens.doublequoted_strings.open (")
|
||||
lang.ruby.tokens.doublequoted_strings.close ((?<!")")
|
||||
lang.ruby.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.ruby.tokens.doublequoted_strings.change_to interpolated_ruby
|
||||
lang.ruby.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
|
||||
lang.ruby.tokens.doublequoted_strings.format green bold
|
||||
lang.ruby.tokens.interpolated_string.open (%Q?\{)
|
||||
lang.ruby.tokens.interpolated_string.close (\})
|
||||
lang.ruby.tokens.interpolated_string.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.ruby.tokens.interpolated_string.format green bold
|
||||
lang.ruby.tokens.interpolated_string.change_to interpolated_ruby
|
||||
lang.interpolated_ruby.format.default green bold
|
||||
lang.interpolated_ruby.tokens.interpolation.open (#\{)
|
||||
lang.interpolated_ruby.tokens.interpolation.close (\})
|
||||
lang.interpolated_ruby.tokens.interpolation.format 12 bold
|
||||
lang.interpolated_ruby.tokens.interpolation.change_to ruby
|
||||
lang.ruby.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.ruby.tokens.singlequoted_strings ('.*?[^\\]'|'')
|
||||
lang.ruby.tokens.singlequoted_strings.format green bold
|
||||
lang.ruby.tokens.backquoted_strings = lang.shared.tokens.backquoted_strings
|
||||
lang.ruby.tokens.backquoted_strings (`.*?[^\\]`|``)
|
||||
lang.ruby.tokens.backquoted_strings.format red bold
|
||||
lang.ruby.tokens.interpolated_exec_string.open (%x\{)
|
||||
lang.ruby.tokens.interpolated_exec_string.close (\})
|
||||
|
|
@ -845,12 +839,9 @@ lang.php.bangmask #!.*php|<\?php
|
|||
lang.php.format.default white bold
|
||||
lang.php.format.selection inverse
|
||||
lang.php.format.found yellow inverse
|
||||
lang.php.tokens.doublequoted_strings.open (")
|
||||
lang.php.tokens.doublequoted_strings.close ((?<!")")
|
||||
lang.php.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.php.tokens.doublequoted_strings.change_to php_strings
|
||||
lang.php_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.php.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.php.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.php.tokens.doublequoted_strings.format green bold
|
||||
lang.php.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.php.tokens.singlequoted_strings.format green bold
|
||||
lang.php.tokens.reserved_words \b(NULL|E_ALL|__wakeup|not|endwhile|__sleep|new|endswitch|__LINE__|list|endif|__FILE__|global|endforeach|while|include_once|endfor|virtual|include|enddeclare|xor|if|empty|var|elseif|TRUE|true|else|this|echo|stdClass|die|switch|do|static|default|return|function|declare|require_once|foreach|continue|require|for|class|print|FALSE|false|cfunction|PHP_VERSION|extends|case|exit|break|PHP_OS|eval|argc|parent|E_WARNING|as|or|E_ERROR|argv|old_function|E_PARSE|and)\b
|
||||
lang.php.tokens.reserved_words.format white
|
||||
|
|
@ -900,16 +891,13 @@ lang.perl.tokens.modifiers \s+(if|unless|until|while)
|
|||
lang.perl.tokens.modifiers.format 9 bold
|
||||
lang.perl.tokens.constants \b([A-Z_]+|[A-Z_][A-Z0-9_]+)\b
|
||||
lang.perl.tokens.constants.format yellow bold
|
||||
lang.perl.tokens.regular_expressions = lang.shared.tokens.regular_expressions
|
||||
lang.perl.tokens.regular_expressions (\/.+?[^\\]\/)
|
||||
lang.perl.tokens.regular_expressions.format red bold
|
||||
lang.perl.tokens.doublequoted_strings.open (")
|
||||
lang.perl.tokens.doublequoted_strings.close ((?<!")")
|
||||
lang.perl.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.perl.tokens.doublequoted_strings.change_to perl_strings
|
||||
lang.perl_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.perl.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.perl.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.perl.tokens.doublequoted_strings.format green bold
|
||||
lang.perl.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.perl.tokens.singlequoted_strings.format green bold
|
||||
lang.perl.tokens.backquoted_strings = lang.shared.tokens.backquoted_strings
|
||||
lang.perl.tokens.backquoted_strings (`.*?[^\\]`)
|
||||
lang.perl.tokens.backquoted_strings.format red bold
|
||||
lang.perl.tokens.reserved_words \b(else|for|foreach|return|do|next|elsif|last|redo|continue|sub|goto)\b
|
||||
lang.perl.tokens.reserved_words.format white
|
||||
|
|
@ -947,14 +935,11 @@ lang.python.tokens.constants.format yellow bold
|
|||
lang.python.tokens.comments (#.*)
|
||||
lang.python.tokens.comments.format = lang.shared.tokens.comments.format
|
||||
lang.python.comment_string "# "
|
||||
lang.python.tokens.doublequoted_strings.open (")
|
||||
lang.python.tokens.doublequoted_strings.close ((?<!")")
|
||||
lang.python.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.python.tokens.doublequoted_strings.change_to python_strings
|
||||
lang.python_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.python.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.python.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.python.tokens.doublequoted_strings.format green bold
|
||||
lang.python.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.python.tokens.singlequoted_strings.format green bold
|
||||
lang.python.tokens.backquoted_strings = lang.shared.tokens.backquoted_strings
|
||||
lang.python.tokens.backquoted_strings (`.*?[^\\]`)
|
||||
lang.python.tokens.backquoted_strings.format red bold
|
||||
lang.python.tokens.reserved_words \b(and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|yield)\b
|
||||
lang.python.tokens.reserved_words.format white
|
||||
|
|
@ -976,12 +961,9 @@ lang.java.filemask \.(?:java|js)$
|
|||
lang.java.format.default white bold
|
||||
lang.java.format.selection inverse
|
||||
lang.java.format.found yellow inverse
|
||||
lang.java.tokens.doublequoted_strings.open (")
|
||||
lang.java.tokens.doublequoted_strings.close ((?<!")")
|
||||
lang.java.tokens.doublequoted_strings.format = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.java.tokens.doublequoted_strings.change_to java_strings
|
||||
lang.java_strings.format.default = lang.shared.tokens.doublequoted_strings.format
|
||||
lang.java.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.java.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.java.tokens.doublequoted_strings.format green bold
|
||||
lang.java.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.java.tokens.singlequoted_strings.format green bold
|
||||
lang.java.tokens.reserved_words \b(abstract|do|if|package|synchronized|boolean|double|implements|private|this|break|else|import|protected|throw|byte|extends|instanceof|public|throws|case|false|int|return|transient|catch|final|interface|short|true|char|finally|long|static|try|class|float|native|strictfp|void|const|for|new|super|volatile|continue|goto|null|switch|while|default|assert)\b
|
||||
lang.java.tokens.reserved_words.format white
|
||||
|
|
@ -993,7 +975,7 @@ lang.java.comment_string "// "
|
|||
lang.java.tokens.long_comments.open \/\*
|
||||
lang.java.tokens.long_comments.close \*\/
|
||||
lang.java.tokens.long_comments.format = lang.shared.tokens.comments.format
|
||||
lang.java.tokens.regular_expressions = lang.shared.tokens.regular_expressions
|
||||
lang.java.tokens.regular_expressions (\/.+?[^\\]\/)
|
||||
lang.java.tokens.regular_expressions.format red bold
|
||||
lang.java.tokens.non_alphanum ([!@#$%\^&*()\[\]{}/?=+\-\\|,<.>;:])
|
||||
lang.java.tokens.non_alphanum.format white
|
||||
|
|
@ -1019,7 +1001,7 @@ lang.c.format.selection inverse
|
|||
lang.c.format.found yellow inverse
|
||||
lang.c.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.c.tokens.doublequoted_strings.format green bold
|
||||
lang.c.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.c.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.c.tokens.singlequoted_strings.format green bold
|
||||
lang.c.tokens.reserved_words \b(if|double|break|else|byte|case|int|return|short|char|long|static|void|for|super|continue|goto|switch|while)\b
|
||||
lang.c.tokens.reserved_words.format white
|
||||
|
|
@ -1060,7 +1042,7 @@ lang.conf.tokens.comments.format yellow bold
|
|||
lang.conf.comment_string "# "
|
||||
lang.conf.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.conf.tokens.doublequoted_strings.format green bold
|
||||
lang.conf.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.conf.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.conf.tokens.singlequoted_strings.format green bold
|
||||
lang.conf.indent.size 4
|
||||
lang.conf.indent.auto true
|
||||
|
|
@ -1117,7 +1099,7 @@ lang.sql.tokens.data_types.format brown
|
|||
lang.sql.tokens.comments (--.*)
|
||||
lang.sql.tokens.comments.format = lang.shared.tokens.comments.format
|
||||
lang.sql.comment_string "-- "
|
||||
lang.sql.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.sql.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.sql.tokens.singlequoted_strings.format green bold
|
||||
lang.sql.tokens.typos (==)
|
||||
lang.sql.tokens.typos.format 15 bold
|
||||
|
|
@ -1143,11 +1125,11 @@ lang.bash.tabsize 4
|
|||
lang.bash.tokens.comments (^\s*#.*)
|
||||
lang.bash.tokens.comments.format = lang.shared.tokens.comments.format
|
||||
lang.bash.comment_string "# "
|
||||
lang.bash.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.bash.tokens.singlequoted_strings ('.*?[^\\]')
|
||||
lang.bash.tokens.singlequoted_strings.format green bold
|
||||
lang.bash.tokens.doublequoted_strings (\".*?[^\\]\")
|
||||
lang.bash.tokens.doublequoted_strings.format green bold
|
||||
lang.bash.tokens.backquoted_strings = lang.shared.tokens.backquoted_strings
|
||||
lang.bash.tokens.backquoted_strings (`.*?[^\\]`)
|
||||
lang.bash.tokens.backquoted_strings.format red bold
|
||||
lang.bash.indent.indenters (\{)
|
||||
lang.bash.indent.unindenters (\})
|
||||
|
|
@ -1226,7 +1208,7 @@ lang.yaml.tokens.inline_keyed ([{}])
|
|||
lang.yaml.tokens.inline_keyed.format white
|
||||
lang.yaml.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
|
||||
lang.yaml.tokens.doublequoted_strings.format green bold
|
||||
lang.yaml.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.yaml.tokens.singlequoted_strings ('.*?[^\\]'|'')
|
||||
lang.yaml.tokens.singlequoted_strings.format green bold
|
||||
lang.yaml.tokens.block_scalar (\|[0-9+-]*)$
|
||||
lang.yaml.tokens.block_scalar.format blue bold
|
||||
|
|
@ -1421,14 +1403,14 @@ lang.haskell.tokens.long_comments.open \{-
|
|||
lang.haskell.tokens.long_comments.close -\}
|
||||
lang.haskell.tokens.long_comments.format = lang.shared.tokens.comments.format
|
||||
# lang.haskell.tokens.regular_expressions (\/.+?[^\\]\/)
|
||||
# lang.haskell_comments
|
||||
lang.haskell_comments
|
||||
# lang.haskell.tokens.regular_expressions (\/.+?[^\\]\/)
|
||||
# lang.haskell.tokens.regular_expressions.format red bold
|
||||
# lang.haskell.tokens.regular_expressions2 (%r\{.+?[^\}]\})
|
||||
# lang.haskell.tokens.regular_expressions2.format red bold
|
||||
lang.haskell.tokens.doublequoted_strings (\".*?[^\\]\"|\"\")
|
||||
lang.haskell.tokens.doublequoted_strings.format green bold
|
||||
lang.haskell.tokens.singlequoted_strings = lang.shared.tokens.singlequoted_strings
|
||||
lang.haskell.tokens.singlequoted_strings ('.*?[^\\]'|'')
|
||||
lang.haskell.tokens.singlequoted_strings.format green bold
|
||||
# lang.haskell.tokens.backquoted_strings (`.*?[^\\]`|``)
|
||||
# lang.haskell.tokens.backquoted_strings.format red bold
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module Diakonos
|
||||
VERSION = '0.8.12'
|
||||
LAST_MODIFIED = 'July 20, 2009'
|
||||
LAST_MODIFIED = 'July 14, 2009'
|
||||
|
||||
def self.parse_version( s )
|
||||
if s
|
||||
|
|
|
|||
Loading…
Reference in a new issue