ccdb depends on DCD and handles dbPath config

Author: rtbo

source/served/extension.d

@@ -111,12 +111,8 @@ void changedConfig(ConfigWorkspace target, string[] paths, served.types.Configur
 		case "d.ccdbPath":
 			if (config.d.ccdbPath && backend.has!ClangCompilationDatabaseComponent(workspaceFs))
 			{
-				backend.get!ClangCompilationDatabaseComponent(workspaceFs)
-					.setPath(config.d.ccdbPath.userPath);
-
-				if (backend.has!DCDComponent(workspaceFs))
-					backend.get!DCDComponent(workspaceFs).refreshImports();
-
+				const ccdbPath = config.d.ccdbPath.userPath.buildNormalizedPath();
+				backend.get!ClangCompilationDatabaseComponent(workspaceFs).setDbPath(ccdbPath);
 			}
 			break;
 		case "d.dubConfiguration":
@@ -674,10 +670,7 @@ void delayedProjectActivation(WorkspaceD.Instance instance, string workspaceRoot
 	if (ccdbPath)
 	{
 		trace("starting CCDB with ", ccdbPath);
-		instance.get!ClangCompilationDatabaseComponent.setPath(ccdbPath);
-
-		if (instance.has!DCDComponent)
-			instance.get!DCDComponent.refreshImports();
+		instance.get!ClangCompilationDatabaseComponent.setDbPath(ccdbPath);
 	}
 
 	if (!loadedDub && !disableDub && !ccdbPath)

workspace-d/source/workspaced/com/ccdb.d

@@ -8,10 +8,10 @@ import std.json;
 import fs = std.file;
 
 import workspaced.api;
+import workspaced.com.dcd;
 
 import containers.hashset;
 
-
 @component("ccdb")
 class ClangCompilationDatabaseComponent : ComponentWrapper
 {
@@ -24,24 +24,47 @@ class ClangCompilationDatabaseComponent : ComponentWrapper
 		if (!refInstance)
 			throw new Exception("ccdb requires to be instanced");
 
-		importPathProvider = &imports;
-		stringImportPathProvider = &stringImports;
-		importFilesProvider = &fileImports;
-		projectVersionsProvider = &versions;
-		debugSpecificationsProvider = &debugVersions;
+		if (config.get!bool("ccdb", "registerImportProvider", true))
+			importPathProvider = &imports;
+		if (config.get!bool("ccdb", "registerStringImportProvider", true))
+			stringImportPathProvider = &stringImports;
+		if (config.get!bool("ccdb", "registerImportFilesProvider", false))
+			importFilesProvider = &fileImports;
+		if (config.get!bool("ccdb", "registerProjectVersionsProvider", true))
+			projectVersionsProvider = &versions;
+		if (config.get!bool("ccdb", "registerDebugSpecificationsProvider", true))
+			debugSpecificationsProvider = &debugVersions;
+
+		if (auto dbPath = config.get!string("ccdb", "dbPath", null))
+			loadDb(dbPath);
+	}
+
+	void setDbPath(string dbPath)
+	{
+		import std.path : buildNormalizedPath;
+
+		if (dbPath)
+			loadDb(dbPath);
+		else
+			unloadDb();
+
+		config.set("ccdb", "dbPath", dbPath.buildNormalizedPath());
+
+		if (refInstance.has!DCDComponent)
+			refInstance.get!DCDComponent.refreshImports();
 	}
 
-	void setPath(string filename)
+	string getDbPath() const
 	{
-		loadDb(filename);
+		return config.get!string("ccdb", "dbPath", null);
 	}
 
-	private void loadDb(string filename)
+	private void loadDb(string dbPath)
 	{
 		import std.algorithm : each, filter, map;
 		import std.array : array;
 
-		trace("parsing CCDB from ", filename);
+		trace("parsing CCDB from ", dbPath);
 
 		HashSet!string imports;
 		HashSet!string stringImports;
@@ -50,7 +73,7 @@ class ClangCompilationDatabaseComponent : ComponentWrapper
 		HashSet!string debugVersions;
 
 		{
-			string jsonString = cast(string) assumeUnique(fs.read(filename));
+			string jsonString = cast(string) assumeUnique(fs.read(dbPath));
 			auto json = parseJSON(jsonString);
 			// clang db can be quite large (e.g. 100 k lines of JSON data on large projects)
 			// we release memory when possible to avoid having at the same time more than
@@ -62,7 +85,7 @@ class ClangCompilationDatabaseComponent : ComponentWrapper
 				.filter!(cc => cc.isValid)
 				.each!(cc =>
 						cc.feedOptions(imports, stringImports, fileImports, versions, debugVersions)
-				);
+			);
 		}
 
 		_importPaths = imports[].array;
@@ -72,6 +95,15 @@ class ClangCompilationDatabaseComponent : ComponentWrapper
 		_debugVersions = debugVersions[].array;
 	}
 
+	private void unloadDb()
+	{
+		_importPaths = null;
+		_stringImportPaths = null;
+		_importFiles = null;
+		_versions = null;
+		_debugVersions = null;
+	}
+
 	/// Lists all import paths
 	string[] imports() @property nothrow
 	{