Merge branch 'master' into inclloop

Author: ZacLN

src/StaticLint.jl

@@ -127,7 +127,7 @@ If this is successful it traverses the code associated with the loaded file.
 """
 function followinclude(x, state::State)
     if typof(x) === Call && typof(x.args[1]) === IDENTIFIER && valof(x.args[1]) == "include"
-        path = get_path(x)
+        path = get_path(x, state)
         if isempty(path)
         elseif hasfile(state.server, path)
         elseif canloadfile(state.server, path)
@@ -154,8 +154,7 @@ function followinclude(x, state::State)
             state.file = oldfile
             pop!(state.included_files)
         else
-            # (printstyled(">>>>Can't follow include", color = :red);printstyled(" $(Expr(x)) from $(dirname(state.path))\n"))
-            # error handling for broken `include` here
+            seterror!(x, MissingFile)
         end
     end
 end

src/linting/checks.jl

@@ -9,7 +9,9 @@ PointlessOR,
 PointlessAND,
 UnusedBinding,
 InvalidTypeDeclaration,
-IncludeLoop)
+IncludeLoop,
+MissingFile)
+
 
 const LintCodeDescriptions = Dict{LintCodes,String}(
     IncorrectCallNargs => "An incorrect number of function arguments has been passed.",
@@ -21,7 +23,8 @@ const LintCodeDescriptions = Dict{LintCodes,String}(
     PointlessAND => "The first argument of a `&&` call is `false`.",
     UnusedBinding => "The variable name has been bound but not used.",
     InvalidTypeDeclaration => "A non-DataType has been used in a type declaration statement.",
-    IncludeLoop => "Loop detected, this file has already been included."
+    IncludeLoop => "Loop detected, this file has already been included.",
+    MissingFile => "The included file can not be found."
 )
 
 haserror(m::Meta) = m.error !== nothing

src/server.jl

@@ -94,7 +94,7 @@ end
 Usually called on the argument to `include` calls, and attempts to determine
 the path of the file to be included. Has limited support for `joinpath` calls.
 """
-function get_path(x::EXPR)
+function get_path(x::EXPR, state)
     if typof(x) === Call && length(x.args) == 4
         parg = x.args[3]
         if CSTParser.is_lit_string(parg)
@@ -105,6 +105,8 @@ function get_path(x::EXPR)
             for i = 2:length(parg.args)
                 arg = parg.args[i]
                 if typof(arg) === PUNCTUATION
+                elseif _is_macrocall_to_BaseDIR(arg) # Assumes @__DIR__ points to Base macro.
+                    path = string(path, "/", dirname(getpath(state.file)))
                 elseif CSTParser.is_lit_string(arg)
                     path = string(path, "/", CSTParser.str_value(arg))
                 else
@@ -116,3 +118,7 @@ function get_path(x::EXPR)
     end
     return ""
 end
+
+_is_macrocall_to_BaseDIR(arg) = typof(arg) === CSTParser.MacroCall && length(arg.args) == 1 &&
+    typof(arg.args[1]) === CSTParser.MacroName && length(arg.args[1].args) == 2 &&
+    valof(arg.args[1].args[2]) == "__DIR__"