From b40283461efd88baf360d79c848d0a508d76c883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20BATAILLE?= Date: Wed, 16 Jul 2014 19:45:07 +0200 Subject: [PATCH 1/2] =?UTF-8?q?fix=20warnings=20issue=20#1=20[Textpow=201.?= =?UTF-8?q?3.1]=20warning=20on=20bad=20unicode=20syntax=20=09modifi=C3=A9:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20lib/textpow/syntax.rb=20=09modifi?= =?UTF-8?q?=C3=A9:=20=20=20=20=20=20=20=20=20lib/textpow/syntax/source.cam?= =?UTF-8?q?lp4.ocaml.syntax=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20l?= =?UTF-8?q?ib/textpow/syntax/source.ocaml.syntax=20=09modifi=C3=A9:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20lib/textpow/syntax/text.bbcode.syntax=20?= =?UTF-8?q?=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20lib/textpow/syntax/t?= =?UTF-8?q?ext.html.asp.net.syntax=20=09modifi=C3=A9:=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20lib/textpow/syntax/text.html.mt.syntax=20=09modifi=C3=A9:?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20lib/textpow/syntax/text.html.strict.?= =?UTF-8?q?active4d.syntax=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20li?= =?UTF-8?q?b/textpow/syntax/text.html.tt.syntax=20=09modifi=C3=A9:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20lib/textpow/syntax/text.html.twiki.syntax?= =?UTF-8?q?=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20lib/textpow/synta?= =?UTF-8?q?x/text.html.xhtml.1-strict.syntax=20=09modifi=C3=A9:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20lib/textpow/syntax/text.restructuredtext.synt?= =?UTF-8?q?ax=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20lib/textpow/syn?= =?UTF-8?q?tax/text.tex.latex.sweave.syntax?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/textpow/syntax.rb | 2 +- lib/textpow/syntax/source.camlp4.ocaml.syntax | 4 ++-- lib/textpow/syntax/source.ocaml.syntax | 2 +- lib/textpow/syntax/text.bbcode.syntax | 6 +++--- lib/textpow/syntax/text.html.asp.net.syntax | 2 +- lib/textpow/syntax/text.html.mt.syntax | 2 +- lib/textpow/syntax/text.html.strict.active4d.syntax | 2 +- lib/textpow/syntax/text.html.tt.syntax | 2 +- lib/textpow/syntax/text.html.twiki.syntax | 2 +- lib/textpow/syntax/text.html.xhtml.1-strict.syntax | 4 ++-- lib/textpow/syntax/text.restructuredtext.syntax | 2 +- lib/textpow/syntax/text.tex.latex.sweave.syntax | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/textpow/syntax.rb b/lib/textpow/syntax.rb index 14839b4..ddb7517 100644 --- a/lib/textpow/syntax.rb +++ b/lib/textpow/syntax.rb @@ -117,7 +117,7 @@ def parse_regex(value) end def parse_regex_with_invalid_chars(value) - Regexp.new(value.force_encoding('UTF-8')) + Regexp.new(value.force_encoding('UTF-8'), nil, 'n') rescue RegexpError => e if e.message =~ /UTF-8/ or e.message =~ /invalid multibyte escape/ puts "Ignored utf8 regex error #{$!}" diff --git a/lib/textpow/syntax/source.camlp4.ocaml.syntax b/lib/textpow/syntax/source.camlp4.ocaml.syntax index 7ff668f..a04c066 100644 --- a/lib/textpow/syntax/source.camlp4.ocaml.syntax +++ b/lib/textpow/syntax/source.camlp4.ocaml.syntax @@ -22,7 +22,7 @@ patterns: endCaptures: "1": name: punctuation.definition.camlp4-stream.ocaml - begin: (\[<)(?=.*?>]) + begin: (\[<)(?=.*?>\]) beginCaptures: "1": name: punctuation.definition.camlp4-stream.ocaml @@ -30,7 +30,7 @@ patterns: patterns: - include: "#camlpppp-streams" - name: punctuation.definition.camlp4-stream.ocaml - match: \[<|>] + match: \[<|>\] - name: keyword.other.camlp4.ocaml match: \bparser\b|<(<|:)|>>|\$(:|\${0,1}) foldingStopMarker: (\bEND\b) diff --git a/lib/textpow/syntax/source.ocaml.syntax b/lib/textpow/syntax/source.ocaml.syntax index af5bb0d..c258445 100644 --- a/lib/textpow/syntax/source.ocaml.syntax +++ b/lib/textpow/syntax/source.ocaml.syntax @@ -651,7 +651,7 @@ patterns: endCaptures: "1": name: punctuation.definition.camlp4-stream.ocaml - begin: (?=(\[<)(?![^\[]+?[^>]])) + begin: (?=(\[<)(?![^\[]+?[^>\]])) end: (>]) patterns: - include: source.camlp4.ocaml diff --git a/lib/textpow/syntax/text.bbcode.syntax b/lib/textpow/syntax/text.bbcode.syntax index 043aeab..d34d049 100644 --- a/lib/textpow/syntax/text.bbcode.syntax +++ b/lib/textpow/syntax/text.bbcode.syntax @@ -223,7 +223,7 @@ patterns: contentName: markup.underline.link.bbcode end: (\[/)(?i:url)(\]) patterns: - - match: "[\\[]]+" + - match: "[\\[\\]]+" - name: meta.link.inline.bbcode captures: "0": @@ -236,7 +236,7 @@ patterns: contentName: markup.underline.link.email.bbcode end: (\[/)(?i:email)(\]) patterns: - - match: "[\\[]]+" + - match: "[\\[\\]]+" - name: meta.link.image.bbcode endCaptures: "0": @@ -260,7 +260,7 @@ patterns: name: punctuation.definition.tag.bbcode end: (\[/)(?i:img)(\]) patterns: - - match: "[\\[]]+?" + - match: "[\\[\\]]+?" - name: constant.other.smiley.bbcode captures: "3": diff --git a/lib/textpow/syntax/text.html.asp.net.syntax b/lib/textpow/syntax/text.html.asp.net.syntax index cd0e845..8b4228a 100644 --- a/lib/textpow/syntax/text.html.asp.net.syntax +++ b/lib/textpow/syntax/text.html.asp.net.syntax @@ -203,7 +203,7 @@ repository: - include: source.asp.vb.net tag-generic-attribute: name: entity.other.attribute-name.html - match: \b([a-zA-Z-:]+) + match: \b([a-zA-Z\-:]+) ruby: name: source.ruby.embedded.html endCaptures: diff --git a/lib/textpow/syntax/text.html.mt.syntax b/lib/textpow/syntax/text.html.mt.syntax index 7f06bdc..54d7ba4 100644 --- a/lib/textpow/syntax/text.html.mt.syntax +++ b/lib/textpow/syntax/text.html.mt.syntax @@ -113,7 +113,7 @@ repository: - include: "#entities" tag-generic-attribute: name: entity.other.attribute-name.html - match: \b([a-zA-Z-_:]+) + match: \b([a-zA-Z\-_:]+) ruby: name: source.ruby.embedded.html captures: diff --git a/lib/textpow/syntax/text.html.strict.active4d.syntax b/lib/textpow/syntax/text.html.strict.active4d.syntax index 74a3f8a..9301322 100644 --- a/lib/textpow/syntax/text.html.strict.active4d.syntax +++ b/lib/textpow/syntax/text.html.strict.active4d.syntax @@ -104,7 +104,7 @@ repository: - include: "#embedded-code" tag-generic-attribute: name: entity.other.attribute-name.html - match: \b([a-zA-Z-:]+) + match: \b([a-zA-Z\-:]+) string-single-quoted-js: name: string.quoted.single.js endCaptures: diff --git a/lib/textpow/syntax/text.html.tt.syntax b/lib/textpow/syntax/text.html.tt.syntax index f1b36c7..26c2adf 100644 --- a/lib/textpow/syntax/text.html.tt.syntax +++ b/lib/textpow/syntax/text.html.tt.syntax @@ -91,7 +91,7 @@ repository: captures: "2": name: punctuation.separator.key-value.tt - match: \b([a-zA-Z-_:]+)\s*(=) + match: \b([a-zA-Z\-_:]+)\s*(=) keyword: name: string.unquoted.tt match: \b([A-Za-z0-9_]+) diff --git a/lib/textpow/syntax/text.html.twiki.syntax b/lib/textpow/syntax/text.html.twiki.syntax index ea9c8bd..b81c3a2 100644 --- a/lib/textpow/syntax/text.html.twiki.syntax +++ b/lib/textpow/syntax/text.html.twiki.syntax @@ -89,7 +89,7 @@ repository: name: punctuation.definition.link.twiki "5": name: string.other.link.title.twiki - match: (\[)([^]]*)(\]) *(\[)(.*?)(\]) + match: (\[)([^\]]*)(\]) *(\[)(.*?)(\]) numlist-paragraph: patterns: - name: markup.list.numbered.paragraph diff --git a/lib/textpow/syntax/text.html.xhtml.1-strict.syntax b/lib/textpow/syntax/text.html.xhtml.1-strict.syntax index 92e9504..88c2280 100644 --- a/lib/textpow/syntax/text.html.xhtml.1-strict.syntax +++ b/lib/textpow/syntax/text.html.xhtml.1-strict.syntax @@ -172,7 +172,7 @@ repository: patterns: - include: source.css - name: invalid.illegal.char_not_allowed - match: <|>|]]>|-- + match: <|>|\]\]>|-- - include: "#entities" - include: source.css - name: meta.tag.meta.style.html @@ -1044,7 +1044,7 @@ repository: patterns: - include: source.js - name: invalid.illegal.char_not_allowed - match: <|>|]]>|-- + match: <|>|\]\]>|-- - include: "#entities" - include: source.js - name: meta.tag.block.script.html diff --git a/lib/textpow/syntax/text.restructuredtext.syntax b/lib/textpow/syntax/text.restructuredtext.syntax index 32d816a..a2a910b 100644 --- a/lib/textpow/syntax/text.restructuredtext.syntax +++ b/lib/textpow/syntax/text.restructuredtext.syntax @@ -25,7 +25,7 @@ repository: name: punctuation.definition.directive.restructuredtext "2": name: punctuation.separator.key-value.restructuredtext - match: (\.\.)\s[A-z][A-z0-9-_]+(::)\s*$ + match: (\.\.)\s[A-z][A-z0-9\-_]+(::)\s*$ comment: directives - name: meta.raw.block.restructuredtext captures: diff --git a/lib/textpow/syntax/text.tex.latex.sweave.syntax b/lib/textpow/syntax/text.tex.latex.sweave.syntax index 5d908a3..aa77be9 100644 --- a/lib/textpow/syntax/text.tex.latex.sweave.syntax +++ b/lib/textpow/syntax/text.tex.latex.sweave.syntax @@ -5,10 +5,10 @@ fileTypes: - Rnw - snw - rnw -firstLineMatch: ^\\documentclass(?!.*\{beamer\})|^<<(.?*)>>=$ +firstLineMatch: ^\\documentclass(?!.*\{beamer\})|^<<(.*)>>=$ scopeName: text.tex.latex.sweave uuid: 1F450973-8259-4BA2-A754-48C634561A13 -foldingStartMarker: ^<<(.?*)>>=|\\begin\{.*\} +foldingStartMarker: ^<<(.*)>>=|\\begin\{.*\} patterns: - name: meta.block.parameters.sweave endCaptures: @@ -80,5 +80,5 @@ patterns: patterns: - include: source.r - include: text.tex.latex -foldingStopMarker: ^@(.?*)$|\\end\{.*\} +foldingStopMarker: ^@(.*)$|\\end\{.*\} keyEquivalent: ^~S From 6c68b5dafec8bcecc2640f8d2a0806e881586d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20BATAILLE?= Date: Wed, 16 Jul 2014 19:55:13 +0200 Subject: [PATCH 2/2] =?UTF-8?q?issue=20#1=20[Textpow=201.3.1]=20warning=20?= =?UTF-8?q?on=20bad=20unicode=20syntax=20Reference=20to=20Redmine=20added?= =?UTF-8?q?=20=09modifi=C3=A9:=20=20=20=20=20=20=20=20=20README.rdoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.rdoc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.rdoc b/README.rdoc index c75e972..005b5c7 100644 --- a/README.rdoc +++ b/README.rdoc @@ -78,6 +78,26 @@ having name="text.string", position=10 and the second having * parse text plist files {example}[https://raw.github.com/kangax/textmate-js-language-syntax-file/master/JavaScript.plist] * update more languages via github urls +== Examples of uses + +* Textpow is used by the Ultraviolet gem + http://rubygems.org/gems/ultraviolet + +* The Ultraviolet gem is used by the Redmine_ultraviolet plugin + https://github.com/jbbarth/redmine_ultraviolet + + With Redmine, Textpow warnings still exist when Rails is launched : + + /home/projets/redmine/trunk/plugins/redmine_ultraviolet/lib/uv_syntax_highlighting.rb:5: warning: already initialized constant CUSTOM_FIELD_NAME + /var/lib/gems/1.9.1/gems/textpow-1.3.1/lib/textpow/syntax.rb:120: warning: invalid back reference: /\\(\n\d+|\k\w+|(?