fixup! in import/using expr, newline is allowed after first token

Author: AmaiKinono

Units/parser-julia.r/library.d/expected.tags

@@ -10,3 +10,11 @@ func2	input.jl	/^import Module4.func1, Module4.func2$/;"	kind:unknown	scope:modu
 Module5	input.jl	/^import Module5: func1, func2$/;"	kind:module	roles:imported
 func1	input.jl	/^import Module5: func1, func2$/;"	kind:unknown	scope:module:Module5	roles:imported
 func2	input.jl	/^import Module5: func1, func2$/;"	kind:unknown	scope:module:Module5	roles:imported
+MyModule	input.jl	/^module MyModule$/;"	kind:module	roles:def
+Module6	input.jl	/^using Module6,$/;"	kind:module	roles:using
+Module7	input.jl	/^      Module7,$/;"	kind:module	roles:using
+Module8	input.jl	/^      Module8$/;"	kind:module	roles:using
+Module9	input.jl	/^using Module9: func1,$/;"	kind:module	roles:using
+func1	input.jl	/^using Module9: func1,$/;"	kind:unknown	scope:module:Module9	roles:using
+func2	input.jl	/^               func2,$/;"	kind:unknown	scope:module:Module9	roles:using
+func3	input.jl	/^               func3$/;"	kind:unknown	scope:module:Module9	roles:using

Units/parser-julia.r/library.d/input.jl

@@ -3,3 +3,13 @@ using Module2: func1, func2
 import Module3
 import Module4.func1, Module4.func2
 import Module5: func1, func2
+
+module MyModule
+using Module6,
+      Module7,
+      Module8
+
+using Module9: func1,
+               func2,
+               func3
+end

parsers/julia.c

@@ -1199,8 +1199,9 @@ static void parseModule (lexerState *lexer, vString *scope, int parent_kind)
     //advanceToken(lexer, true);
     //parseExpr(lexer, true, K_MODULE, scope);
 }
+
 /*
- * Parse a token in import/using expression that may have a dot in it.
+ * Parse a token in import expression that may have a dot in it.
  */
 static void parseImportToken(lexerState *lexer, vString *scope, int module_role, int unknown_role, vString *module_name)
 {
@@ -1228,33 +1229,50 @@ static void parseImport (lexerState *lexer, vString *scope, int token_type)
     vString *name = vStringNew();
     int module_role;
     int unknown_role;
+    /* capture the imported name */
+    advanceToken(lexer, true);
+    vStringCopy(name, lexer->token_str);
     if (token_type == TOKEN_IMPORT)
     {
         module_role = JULIA_MODULE_IMPORTED;
         unknown_role = JULIA_UNKNOWN_IMPORTED;
+        /* The import expression may look like "import Mod" or "import
+         * Mod.symbol", we have to deal with these 2 possibilities. */
+        parseImportToken(lexer, scope, module_role, unknown_role, name);
     }
     else /* if (token_type) == TOKEN_USING */
     {
         module_role = JULIA_MODULE_USING;
         unknown_role = JULIA_UNKNOWN_USING;
+        /* The using expression always look like "using Mod", so we can tag it
+         * easily. */
+        addReferenceTag(lexer->token_str, K_MODULE, module_role, lexer->line, lexer->pos, NULL);
     }
-    /* capture the imported name */
-    advanceToken(lexer, true);
-    vStringCopy(name, lexer->token_str);
-    parseImportToken(lexer, scope, module_role, unknown_role, name);
     if (lexer->cur_c == ':' || lexer->cur_c == ',')
     {
         char delimiter = lexer->cur_c;
         advanceChar(lexer);
         advanceToken(lexer, true);
+        if (lexer->cur_token == TOKEN_NEWLINE)
+        {
+            advanceToken(lexer, true);
+        }
         while (lexer->cur_token == TOKEN_IDENTIFIER || lexer->cur_token == TOKEN_MACROCALL)
         {
-            if (delimiter == ',')
+            if (token_type == TOKEN_IMPORT && delimiter == ',')
             {
+                /* import Mod1.symbol1, Mod2.symbol2, Mod3 */
                 parseImportToken(lexer, scope, module_role, unknown_role, name);
             }
+            else if (token_type == TOKEN_USING && delimiter == ',')
+            {
+                /* using Mod1, Mod2 */
+                addReferenceTag(lexer->token_str, K_MODULE, module_role, lexer->line, lexer->pos, NULL);
+            }
             else /* if (delimiter == ':') */
             {
+                /* import Mod1: symbol1, symbol2 */
+                /* using Mod1: symbol1, symbol2 */
                 addReferenceTag(lexer->token_str, K_UNKNOWN, unknown_role, lexer->line, lexer->pos, name);
             }
             skipWhitespace(lexer, false);