Skip to content

Commit

Permalink
Fix Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gama11
Gama11 committed Jun 1, 2019
1 parent e2b46c1 commit de83d56
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions haxe.tmLanguage
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion helper/haxe-argument.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>scopeName</key><string>source.hx.argument</string><key>repository</key><dict><key>parameter</key><dict><key>patterns</key><array><dict><key>include</key><string>#parameter-name</string></dict><dict><key>include</key><string>#parameter-type-hint</string></dict><dict><key>include</key><string>#parameter-assign</string></dict><dict><key>include</key><string>source.hx#punctuation-comma</string></dict><dict><key>include</key><string>source.hx#global</string></dict></array></dict><key>parameter-type-hint</key><dict><key>end</key><string>(?=\)(?!\s*-&gt;)|,|=)</string><key>beginCaptures</key><dict><key>0</key><dict><key>name</key><string>keyword.operator.type.annotation.hx</string></dict></dict><key>begin</key><string>:</string><key>patterns</key><array><dict><key>include</key><string>source.hx#type</string></dict></array></dict><key>parameter-name</key><dict><key>endCaptures</key><dict><key>1</key><dict><key>name</key><string>variable.parameter.hx</string></dict></dict><key>end</key><string>([_a-zA-Z]\w*)</string><key>begin</key><string>^</string><key>patterns</key><array><dict><key>include</key><string>source.hx#global</string></dict><dict><key>include</key><string>source.hx#metadata</string></dict><dict><key>include</key><string>source.hx#operator-optional</string></dict></array></dict><key>parameter-assign</key><dict><key>end</key><string>$</string><key>beginCaptures</key><dict><key>0</key><dict><key>name</key><string>keyword.operator.assignment.hx</string></dict></dict><key>begin</key><string>=</string><key>patterns</key><array><dict><key>include</key><string>source.hx#block</string></dict><dict><key>include</key><string>source.hx#block-contents</string></dict></array></dict></dict><key>patterns</key><array><dict><key>include</key><string>#parameter</string></dict></array></dict></plist>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>patterns</key><array><dict><key>include</key><string>#parameter</string></dict></array><key>repository</key><dict><key>parameter</key><dict><key>patterns</key><array><dict><key>include</key><string>#parameter-name</string></dict><dict><key>include</key><string>#parameter-type-hint</string></dict><dict><key>include</key><string>#parameter-assign</string></dict><dict><key>include</key><string>source.hx#punctuation-comma</string></dict><dict><key>include</key><string>source.hx#global</string></dict></array></dict><key>parameter-name</key><dict><key>begin</key><string>^</string><key>end</key><string>([_a-zA-Z]\w*)</string><key>endCaptures</key><dict><key>1</key><dict><key>name</key><string>variable.parameter.hx</string></dict></dict><key>patterns</key><array><dict><key>include</key><string>source.hx#global</string></dict><dict><key>include</key><string>source.hx#metadata</string></dict><dict><key>include</key><string>source.hx#operator-optional</string></dict></array></dict><key>parameter-type-hint</key><dict><key>begin</key><string>:</string><key>beginCaptures</key><dict><key>0</key><dict><key>name</key><string>keyword.operator.type.annotation.hx</string></dict></dict><key>end</key><string>(?=\)(?!\s*-&gt;)|,|=)</string><key>patterns</key><array><dict><key>include</key><string>source.hx#type</string></dict></array></dict><key>parameter-assign</key><dict><key>begin</key><string>=</string><key>beginCaptures</key><dict><key>0</key><dict><key>name</key><string>keyword.operator.assignment.hx</string></dict></dict><key>end</key><string>$</string><key>patterns</key><array><dict><key>include</key><string>source.hx#block</string></dict><dict><key>include</key><string>source.hx#block-contents</string></dict></array></dict></dict><key>scopeName</key><string>source.hx.argument</string></dict></plist>
2 changes: 1 addition & 1 deletion helper/haxe-markdown-docs.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>injectionSelector</key><string>L:comment.block.documentation</string><key>scopeName</key><string>documentation.markdown.injection.haxe</string><key>repository</key><dict><key>markdown-comment</key><dict><key>while</key><string>(^|\G)\s*(?:\*(?![*\w]))?(?!\/)(?=([^*]|[*](?!\/))*$)</string><key>begin</key><string>(?&lt;=/\*\*)([^*]|\*(?!/))*$</string><key>patterns</key><array><dict><key>include</key><string>text.html.markdown#fenced_code_block</string></dict><dict><key>include</key><string>text.html.markdown#lists</string></dict><dict><key>include</key><string>source.hx#javadoc-tags</string></dict><dict><key>include</key><string>text.html.markdown#inline</string></dict></array></dict></dict><key>patterns</key><array><dict><key>include</key><string>#markdown-comment</string></dict></array></dict></plist>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>injectionSelector</key><string>L:comment.block.documentation</string><key>patterns</key><array><dict><key>include</key><string>#markdown-comment</string></dict></array><key>repository</key><dict><key>markdown-comment</key><dict><key>begin</key><string>(?&lt;=/\*\*)([^*]|\*(?!/))*$</string><key>while</key><string>(^|\G)\s*(?:\*(?![*\w]))?(?!\/)(?=([^*]|[*](?!\/))*$)</string><key>patterns</key><array><dict><key>include</key><string>text.html.markdown#fenced_code_block</string></dict><dict><key>include</key><string>text.html.markdown#lists</string></dict><dict><key>include</key><string>source.hx#javadoc-tags</string></dict><dict><key>include</key><string>text.html.markdown#inline</string></dict></array></dict></dict><key>scopeName</key><string>documentation.markdown.injection.haxe</string></dict></plist>
2 changes: 1 addition & 1 deletion helper/haxe-markdown.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>injectionSelector</key><string>L:markup.fenced_code.block.markdown</string><key>scopeName</key><string>markdown.haxe.codeblock</string><key>repository</key><dict><key>haxe-code-block</key><dict><key>end</key><string>(^|\G)(?=\s*[`~]{3,}\s*$)</string><key>begin</key><string>haxe(\s+[^`~]*)?$</string><key>patterns</key><array><dict><key>while</key><string>(^|\G)(?!\s*([`~]{3,})\s*$)</string><key>contentName</key><string>meta.embedded.block.haxe</string><key>begin</key><string>(^|\G)(\s*)(.*)</string><key>patterns</key><array><dict><key>include</key><string>source.hx</string></dict></array></dict></array></dict></dict><key>patterns</key><array><dict><key>include</key><string>#haxe-code-block</string></dict></array></dict></plist>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>injectionSelector</key><string>L:markup.fenced_code.block.markdown</string><key>patterns</key><array><dict><key>include</key><string>#haxe-code-block</string></dict></array><key>repository</key><dict><key>haxe-code-block</key><dict><key>begin</key><string>haxe(\s+[^`~]*)?$</string><key>end</key><string>(^|\G)(?=\s*[`~]{3,}\s*$)</string><key>patterns</key><array><dict><key>begin</key><string>(^|\G)(\s*)(.*)</string><key>while</key><string>(^|\G)(?!\s*([`~]{3,})\s*$)</string><key>contentName</key><string>meta.embedded.block.haxe</string><key>patterns</key><array><dict><key>include</key><string>source.hx</string></dict></array></dict></array></dict></dict><key>scopeName</key><string>markdown.haxe.codeblock</string></dict></plist>
2 changes: 1 addition & 1 deletion helper/haxe-type.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>scopeName</key><string>source.hx.type</string><key>patterns</key><array><dict><key>include</key><string>source.hx#type</string></dict></array></dict></plist>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>patterns</key><array><dict><key>include</key><string>source.hx#type</string></dict></array><key>scopeName</key><string>source.hx.type</string></dict></plist>
2 changes: 1 addition & 1 deletion helper/hxml-markdown.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>injectionSelector</key><string>L:markup.fenced_code.block.markdown</string><key>scopeName</key><string>markdown.hxml.codeblock</string><key>repository</key><dict><key>hxml-code-block</key><dict><key>end</key><string>(^|\G)(?=\s*[`~]{3,}\s*$)</string><key>begin</key><string>hxml(\s+[^`~]*)?$</string><key>patterns</key><array><dict><key>while</key><string>(^|\G)(?!\s*([`~]{3,})\s*$)</string><key>contentName</key><string>meta.embedded.block.hxml</string><key>begin</key><string>(^|\G)(\s*)(.*)</string><key>patterns</key><array><dict><key>include</key><string>source.hxml</string></dict></array></dict></array></dict></dict><key>patterns</key><array><dict><key>include</key><string>#hxml-code-block</string></dict></array></dict></plist>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>injectionSelector</key><string>L:markup.fenced_code.block.markdown</string><key>patterns</key><array><dict><key>include</key><string>#hxml-code-block</string></dict></array><key>repository</key><dict><key>hxml-code-block</key><dict><key>begin</key><string>hxml(\s+[^`~]*)?$</string><key>end</key><string>(^|\G)(?=\s*[`~]{3,}\s*$)</string><key>patterns</key><array><dict><key>begin</key><string>(^|\G)(\s*)(.*)</string><key>while</key><string>(^|\G)(?!\s*([`~]{3,})\s*$)</string><key>contentName</key><string>meta.embedded.block.hxml</string><key>patterns</key><array><dict><key>include</key><string>source.hxml</string></dict></array></dict></array></dict></dict><key>scopeName</key><string>markdown.hxml.codeblock</string></dict></plist>
2 changes: 1 addition & 1 deletion hxml.tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>name</key><string>Hxml</string><key>uuid</key><string>CB1B853A-C4C8-42C3-BA70-1B1605BE51C1</string><key>keyEquivalent</key><string>^@H</string><key>foldingStopMarker</key><string>\n\n</string><key>scopeName</key><string>source.hxml</string><key>fileTypes</key><array><string>hxml</string></array><key>foldingStartMarker</key><string>--next</string><key>patterns</key><array><dict><key>captures</key><dict><key>1</key><dict><key>name</key><string>punctuation.definition.comment.hxml</string></dict></dict><key>name</key><string>comment.line.number-sign.hxml</string><key>match</key><string>(#).*$\n?</string></dict><dict><key>end</key><string>\n</string><key>beginCaptures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict></dict><key>begin</key><string>\s*(--macro)\b</string><key>patterns</key><array><dict><key>include</key><string>source.hx</string></dict></array></dict><dict><key>captures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict><key>2</key><dict><key>name</key><string>support.package.hx</string></dict><key>4</key><dict><key>name</key><string>entity.name.type.hx</string></dict></dict><key>match</key><string>\s*(-m|-main|--main)\b\s*\b(?:(([a-z][a-zA-Z0-9]*\.)*)(_*[A-Z]\w*))?\b</string></dict><dict><key>captures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict></dict><key>match</key><string>\s*(-cppia|-cpp?|-js|-as3|-swf-(header|version|lib(-extern)?)|-swf9?|-neko|-python|-php|-cs|-java-lib|-java|-xml|-lua|-hl|-x|-lib|-D|-resource|-exclude|-version|-v|-debug|-prompt|-cmd|-dce\s+(std|full|no)?|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-net-lib|-net-std|-c-arg|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|--help-defines|--help-metas|-help|--help|-java|-cs|--js-modern|--interp|--eval|--dce|--wait|--connect|--cwd|--run).*$</string></dict><dict><key>captures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict></dict><key>match</key><string>\s*(--js(on)?|--lua|--swf-(header|version|lib(-extern)?)|--swf|--as3|--neko|--php|--cppia|--cpp|--cppia|--cs|--java-lib|--java|--python|--hl|-p|--class-path|-L|--library|--define|-r|--resource|--cmd|-C|--verbose|--debug|--prompt|--xml|--json|--net-lib|--net-std|--c-arg|--version|-h|--main).*$</string></dict></array></dict></plist>
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist><dict><key>fileTypes</key><array><string>hxml</string></array><key>foldingStartMarker</key><string>--next</string><key>foldingStopMarker</key><string>\n\n</string><key>keyEquivalent</key><string>^@H</string><key>name</key><string>Hxml</string><key>patterns</key><array><dict><key>captures</key><dict><key>1</key><dict><key>name</key><string>punctuation.definition.comment.hxml</string></dict></dict><key>match</key><string>(#).*$\n?</string><key>name</key><string>comment.line.number-sign.hxml</string></dict><dict><key>begin</key><string>\s*(--macro)\b</string><key>beginCaptures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict></dict><key>end</key><string>\n</string><key>patterns</key><array><dict><key>include</key><string>source.hx</string></dict></array></dict><dict><key>match</key><string>\s*(-m|-main|--main)\b\s*\b(?:(([a-z][a-zA-Z0-9]*\.)*)(_*[A-Z]\w*))?\b</string><key>captures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict><key>2</key><dict><key>name</key><string>support.package.hx</string></dict><key>4</key><dict><key>name</key><string>entity.name.type.hx</string></dict></dict></dict><dict><key>match</key><string>\s*(-cppia|-cpp?|-js|-as3|-swf-(header|version|lib(-extern)?)|-swf9?|-neko|-python|-php|-cs|-java-lib|-java|-xml|-lua|-hl|-x|-lib|-D|-resource|-exclude|-version|-v|-debug|-prompt|-cmd|-dce\s+(std|full|no)?|--flash-strict|--no-traces|--flash-use-stage|--neko-source|--gen-hx-classes|-net-lib|-net-std|-c-arg|--each|--next|--display|--no-output|--times|--no-inline|--no-opt|--php-front|--php-lib|--php-prefix|--remap|--help-defines|--help-metas|-help|--help|-java|-cs|--js-modern|--interp|--eval|--dce|--wait|--connect|--cwd|--run).*$</string><key>captures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict></dict></dict><dict><key>match</key><string>\s*(--js(on)?|--lua|--swf-(header|version|lib(-extern)?)|--swf|--as3|--neko|--php|--cppia|--cpp|--cppia|--cs|--java-lib|--java|--python|--hl|-p|--class-path|-L|--library|--define|-r|--resource|--cmd|-C|--verbose|--debug|--prompt|--xml|--json|--net-lib|--net-std|--c-arg|--version|-h|--main).*$</string><key>captures</key><dict><key>1</key><dict><key>name</key><string>keyword.other.hxml</string></dict></dict></dict></array><key>scopeName</key><string>source.hxml</string><key>uuid</key><string>CB1B853A-C4C8-42C3-BA70-1B1605BE51C1</string></dict></plist>
11 changes: 5 additions & 6 deletions vshaxe-build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"haxelibs": [
{
"name": "yaml",
"installArgs": ["git", "yaml", "https://github.com/mikestead/hx-yaml", "master", "src"]
"installArgs": ["git", "yaml", "https://github.com/Gama11/hx-yaml", "haxe4", "src"]
},
{
"name": "plist",
Expand All @@ -27,20 +27,19 @@
"inherit": "empty",
"name": "tm-language-conversion",
"args": {
"haxelibs": ["yaml", "plist"],
"haxelibs": ["yaml", "plist", "hxnodejs"],
"classPaths": [
"src"
],
"output": {
"target": "neko",
"path": "bin/convert.n"
"target": "js",
"path": "bin/convert.js"
},
"main": "Converter",

"debug": true
},
"afterBuildCommands": [
["neko", "bin/convert.n"]
["node", "bin/convert.js"]
]
},
{
Expand Down

0 comments on commit de83d56

Please sign in to comment.