forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

introduce variable expandedArgs

This commit is contained in:
Axel Ricard 2023-10-10 08:41:17 +02:00 committed by Jan Jurzitza
parent 3bf3f25f9a
commit 69d824f4f7
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/dscanner/main.d
View File

@ -199,11 +199,11 @@ else
}
}
auto expandedArgs = () {
auto expanded = expandArgs(args);
if (excludePaths.length)
{
args = expandArgs(args);
string[] newArgs = [args[0]];
string[] newArgs = [expanded[0]];
foreach(arg; args[1 .. $])
{
if(!excludePaths.map!(p => arg.isSubpathOf(p))
@ -211,8 +211,11 @@ else
newArgs ~= arg;
}
args = newArgs;
return newArgs;
}
else
return expanded;
}();
if (!errorFormat.length)
errorFormat = defaultErrorFormat;
@ -300,15 +303,15 @@ else
}
else if (symbolName !is null)
{
stdout.findDeclarationOf(symbolName, expandArgs(args));
stdout.findDeclarationOf(symbolName, expandedArgs);
}
else if (ctags)
{
stdout.printCtags(expandArgs(args));
stdout.printCtags(expandedArgs);
}
else if (etags || etagsAll)
{
stdout.printEtags(etagsAll, expandArgs(args));
stdout.printEtags(etagsAll, expandedArgs);
}
else if (styleCheck || autofix || resolveMessage.length)
{
@ -321,7 +324,7 @@ else
if (autofix)
{
return .autofix(expandArgs(args), config, errorFormat, cache, moduleCache, applySingleFixes) ? 1 : 0;
return .autofix(expandedArgs, config, errorFormat, cache, moduleCache, applySingleFixes) ? 1 : 0;
}
else if (resolveMessage.length)
{
@ -337,19 +340,19 @@ else
goto case;
case "":
case "dscanner":
generateReport(expandArgs(args), config, cache, moduleCache, reportFile);
generateReport(expandedArgs, config, cache, moduleCache, reportFile);
break;
case "sonarQubeGenericIssueData":
generateSonarQubeGenericIssueDataReport(expandArgs(args), config, cache, moduleCache, reportFile);
generateSonarQubeGenericIssueDataReport(expandedArgs, config, cache, moduleCache, reportFile);
break;
}
}
else
return analyze(expandArgs(args), config, errorFormat, cache, moduleCache, true) ? 1 : 0;
return analyze(expandedArgs, config, errorFormat, cache, moduleCache, true) ? 1 : 0;
}
else if (syntaxCheck)
{
return .syntaxCheck(usingStdin ? ["stdin"] : expandArgs(args), errorFormat, cache, moduleCache) ? 1 : 0;
return .syntaxCheck(usingStdin ? ["stdin"] : expandedArgs, errorFormat, cache, moduleCache) ? 1 : 0;
}
else
{
@ -368,7 +371,7 @@ else
else
{
ulong count;
foreach (f; expandArgs(args))
foreach (f; expandedArgs)
{
LexerConfig config;