Update tokentree

vshaxe · Jul 18, 2020 · 76319c4 · 76319c4
1 parent 4199cbe
commit 76319c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml
@@ -1,3 +1,3 @@
--D tokentree=1.0.24
-# @install: lix --silent download "haxelib:/tokentree#1.0.24" into tokentree/1.0.24/haxelib
--cp ${HAXE_LIBCACHE}/tokentree/1.0.24/haxelib/src
+-D tokentree=1.0.28
+# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#0b48308e5cec2daf8e721dc69835be1360272d8a" into tokentree/1.0.28/github/0b48308e5cec2daf8e721dc69835be1360272d8a
+-cp ${HAXE_LIBCACHE}/tokentree/1.0.28/github/0b48308e5cec2daf8e721dc69835be1360272d8a/src
diff --git a/src/features/vis/tokenTreeVis/TokenTreeContentProvider.hx b/src/features/vis/tokenTreeVis/TokenTreeContentProvider.hx
@@ -32,7 +32,7 @@ class TokenTreeContentProvider extends ContentProviderBase<TokenTree> {
 					tokens.push(t);
 					t = lexer.token(haxeparser.HaxeLexer.tok);
 				}
-				TokenStream.MODE = RELAXED;
+				TokenStream.MODE = Relaxed;
 				content = TokenTreeBuilder.buildTokenTree(tokens, bytes);
 				resolve(rerender());
 			} catch (e:Any) {

diff --git a/src/features/vis/tokenTreeVis/TokenTreeVis.hx b/src/features/vis/tokenTreeVis/TokenTreeVis.hx
@@ -58,7 +58,7 @@ class TokenTreeVis extends TreePrinterBase<TokenTree> {
 			case Const(CIdent(s)):
 				if (~/^[A-Z]/.match(s)) {
 					"type";
-				} else if (t.access().firstOf(POpen).exists()) {
+				} else if (t.access().firstOf(t -> t.match(POpen)).exists()) {
 					"function";
 				} else {
 					"ident";