Fix nonstdid parsing in import

Author: pfitzseb

src/components/internals.jl

@@ -369,8 +369,12 @@ function parse_importexport_item(ps, is_colon = false)
         next(ps)
         EXPR(:OPERATOR, ps.nt.startbyte - ps.t.startbyte,  1 + ps.t.endbyte - ps.t.startbyte, val(ps.t, ps))
     elseif VERSION > v"1.3.0-" && isidentifier(ps.nt) && isemptyws(ps.nws) && (kindof(ps.nnt) === Tokens.STRING || kindof(ps.nnt) === Tokens.TRIPLE_STRING)
-        EXPR(:NONSTDIDENTIFIER, EXPR[INSTANCE(next(ps)), INSTANCE(next(ps))])
-        #TODO fix nonstdid handling
+        id = INSTANCE(next(ps))
+        if valof(id) == "var"
+            EXPR(:NONSTDIDENTIFIER, EXPR[id, INSTANCE(next(ps))])
+        else
+            mErrorToken(ps, EXPR(:NONSTDIDENTIFIER, EXPR[id, INSTANCE(next(ps))]), UnexpectedToken)
+        end
     else
         INSTANCE(next(ps))
     end

test/parser.jl

@@ -1321,4 +1321,13 @@ end
         x, ps = CSTParser.parse(CSTParser.ParseState(str), true)
         @test ps.errored == false
     end
+
+    @testset "#310" begin
+        @test test_expr("""import a.var"papa" """)
+        @test test_expr("""import var"papa" """)
+        x, ps = CSTParser.parse(CSTParser.ParseState("""import a.notvar"papa" """), true)
+        @test ps.errored == true
+        x, ps = CSTParser.parse(CSTParser.ParseState("""import notvar"papa" """), true)
+        @test ps.errored == true
+    end
 end