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

Use new config name override instead of breaking existing ini

This commit is contained in:
Basile Burg 2018-03-30 23:59:36 +02:00
parent 2c82155812
commit 67e0f8a9e4
5 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dscanner.ini
View File

@ -1,5 +1,5 @@
; Configure which static analysis checks are enabled ; Configure which static analysis checks are enabled
[dscanner.analysis.config.StaticAnalysisConfig] [analysis.config.StaticAnalysisConfig]
; Check variable, class, struct, interface, union, and function names against t ; Check variable, class, struct, interface, union, and function names against t
; he Phobos style guide ; he Phobos style guide
style_check="disabled" style_check="disabled"

2
dub.json
View File

@ -14,7 +14,7 @@
"dependencies" : { "dependencies" : {
"libdparse": "~>0.8.0-alpha.5", "libdparse": "~>0.8.0-alpha.5",
"dsymbol" : "~>0.3.0-alpha.3", "dsymbol" : "~>0.3.0-alpha.3",
"inifiled" : "~>1.1.0", "inifiled" : "~>1.2.0",
"emsi_containers" : "~>0.6.0", "emsi_containers" : "~>0.6.0",
"libddoc" : "~>0.3.0-beta.1", "libddoc" : "~>0.3.0-beta.1",
"stdx-allocator" : "~>2.77.0" "stdx-allocator" : "~>2.77.0"

2
inifiled

@ -1 +1 @@
Subproject commit e15038a5c265a9fdaea354476e7759d04e8d0bf9 Subproject commit 971c5356388a73ebbf69e32f7f5e97cfc06cdcff

2
src/dscanner/analysis/config.d
View File

@ -54,7 +54,7 @@ StaticAnalysisConfig disabledConfig()
return config; return config;
} }
@INI("Configure which static analysis checks are enabled") @INI("Configure which static analysis checks are enabled", "analysis.config.StaticAnalysisConfig")
struct StaticAnalysisConfig struct StaticAnalysisConfig
{ {
@INI("Check variable, class, struct, interface, union, and function names against the Phobos style guide") @INI("Check variable, class, struct, interface, union, and function names against the Phobos style guide")

46
src/dscanner/main.d
View File

@ -68,7 +68,6 @@ else
bool printVersion; bool printVersion;
bool explore; bool explore;
string errorFormat; string errorFormat;
bool patchConfig;
try try
{ {
@ -97,8 +96,7 @@ else
"muffinButton", &muffin, "muffinButton", &muffin,
"explore", &explore, "explore", &explore,
"skipTests", &skipTests, "skipTests", &skipTests,
"errorFormat|f", &errorFormat, "errorFormat|f", &errorFormat);
"patchConfig", &patchConfig);
//dfmt on //dfmt on
} }
catch (ConvException e) catch (ConvException e)
@ -235,11 +233,7 @@ else
StaticAnalysisConfig config = defaultStaticAnalysisConfig(); StaticAnalysisConfig config = defaultStaticAnalysisConfig();
string s = configLocation is null ? getConfigurationLocation() : configLocation; string s = configLocation is null ? getConfigurationLocation() : configLocation;
if (s.exists()) if (s.exists())
{
if (hasWrongIniFileSection(s, patchConfig))
return 0;
readINIFile(config, s); readINIFile(config, s);
}
if (skipTests) if (skipTests)
config.enabled2SkipTests; config.enabled2SkipTests;
if (report) if (report)
@ -472,41 +466,3 @@ string getConfigurationLocation()
return getDefaultConfigurationLocation(); return getDefaultConfigurationLocation();
} }
/// Patch the INI file to v0.5.0 format.
//TODO: remove this from v0.6.0
bool hasWrongIniFileSection(string configFilename, bool patch)
{
import std.string : indexOf;
import std.array : replace;
bool result;
static immutable v1 = "analysis.config.StaticAnalysisConfig";
static immutable v2 = "dscanner.analysis.config.StaticAnalysisConfig";
char[] c = cast(char[]) readFile(configFilename);
try if (c.indexOf(v2) < 0)
{
if (!patch)
{
writeln("warning, the configuration file `", configFilename, "` contains an outdated property");
writeln("change manually [", v1, "] to [", v2, "]" );
writeln("or restart D-Scanner with the `--patchConfig` option");
result = true;
}
else
{
c = replace(c, v1, v2);
std.file.write(configFilename, c);
writeln("the configuration file `", configFilename, "` has been updated correctly");
}
}
catch(Exception e)
{
stderr.writeln("error encountered when trying to verify the INI file compatibility");
throw e;
}
return result;
}