Merge pull request #2 from masatake/elm-import-handling

elm: replace pattern matches for import with appropriate handling
universal-ctags · Jan 5, 2017 · c9cc975 · c9cc975
2 parents 65baebb + e22d55e
commit c9cc975
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/Units/simple-elm.d/expected.tags b/Units/simple-elm.d/expected.tags
@@ -1,4 +1,5 @@
 Main	input.elm	/^port module Main exposing (..)$/;"	m
+Je	input.elm	/^import Json.Encode as Je$/;"	x
 Thing	input.elm	/^type Thing$/;"	t
 One	input.elm	/^    = One$/;"	c	type:Thing
 Two Int	input.elm	/^    | Two Int$/;"	c	type:Thing

diff --git a/optlib/elm.c b/optlib/elm.c
@@ -28,6 +28,12 @@ extern parserDefinition* ElmParser (void)
 	static tagRegexTable ElmTagRegexTable [] = {
 		{"^(port[[:blank:]]+)?module[[:blank:]]+([[:upper:]][[:alnum:]_.]*)", "\\2",
 		"m,module,Module", "{scope=push}{exclusive}"},
+		{"^import[[:blank:]]+[[:alnum:]_.]+[[:blank:]]+as[[:blank:]]+([[:alnum:]]+)", "\\1",
+		"x,unknown,Unknown objects", "{scope=clear}{exclusive}"},
+		{"^import[[:blank:]]+([[:alnum:]_.]+)[[:blank:]]exposing", "",
+		"", "{scope=clear}{exclusive}"},
+		{"^import[[:blank:]]+([[:alnum:]_.]+)", "",
+		"", "{scope=clear}{exclusive}"},
 		{"^port[[:blank:]]+([[:lower:]][[:alnum:]_]*).*", "\\1",
 		"p,port,Port", "{scope=clear}{exclusive}"},
 		{"^type +([[:upper:]][[:alnum:]_]*.*)", "\\1",

diff --git a/optlib/elm.ctags b/optlib/elm.ctags
@@ -20,6 +20,13 @@
 --langdef=elm
 --map-elm=+.elm
 --regex-elm=/^(port[[:blank:]]+)?module[[:blank:]]+([[:upper:]][[:alnum:]_.]*)/\2/m,module,Module/{scope=push}{exclusive}
+--regex-elm=/^import[[:blank:]]+[[:alnum:]_.]+[[:blank:]]+as[[:blank:]]+([[:alnum:]]+)/\1/x,unknown,Unknown objects/{scope=clear}{exclusive}
+#
+# Following two patterns are just for clearing scope stack.
+# X in "import X" should be captured as a reference tag in the future.
+#
+--regex-elm=/^import[[:blank:]]+([[:alnum:]_.]+)[[:blank:]]exposing///{scope=clear}{exclusive}
+--regex-elm=/^import[[:blank:]]+([[:alnum:]_.]+)///{scope=clear}{exclusive}
 --regex-elm=/^port[[:blank:]]+([[:lower:]][[:alnum:]_]*).*/\1/p,port,Port/{scope=clear}{exclusive}
 --regex-elm=/^type +([[:upper:]][[:alnum:]_]*.*)/\1/t,type,Type Definition/{scope=set}{exclusive}
 --regex-elm=/^[[:blank:]]+[|=][[:blank:]]+([[:upper:]][[:alnum:]_]*.*)$/\1/c,constructor,Type Constructor/{scope=ref}{exclusive}