From d006aeeafe89cd81e4bc8a567fdf6672c88b3a0b Mon Sep 17 00:00:00 2001 From: Gesa HENTSCHKE Date: Tue, 5 Mar 2024 09:24:00 +0100 Subject: [PATCH] [#242] Make ClangdConfigurationFileManager public API since its needed by some vendors to overwrite certain methods it should be made available. --- bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF | 4 ++-- ...eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml} | 4 ++-- .../{internal/config => }/ClangdConfigurationFileManager.java | 4 +--- .../lsp/clangd/tests/ClangdConfigurationFileManagerTest.java | 2 +- .../internal/clangd/tests/ClangdConfigFileCheckerTest.java | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) rename bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/{org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml => org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml} (69%) rename bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/{internal/config => }/ClangdConfigurationFileManager.java (98%) diff --git a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF index 94c8c1c..cff9bd4 100644 --- a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF @@ -28,9 +28,9 @@ Require-Bundle: org.eclipse.cdt.lsp;bundle-version="0.0.0", org.eclipse.ui.workbench.texteditor;bundle-version="0.0.0", org.eclipse.core.variables;bundle-version="0.0.0", org.yaml.snakeyaml;bundle-version="0.0.0" -Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults.xml, +Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml, + OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults.xml, OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess.xml, - OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml, OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdFallbackManager.xml, OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml Bundle-Activator: org.eclipse.cdt.lsp.clangd.plugin.ClangdPlugin diff --git a/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml b/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml similarity index 69% rename from bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml rename to bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml index 34b4c21..e327dfa 100644 --- a/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml +++ b/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdConfigurationFileManager.java b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdConfigurationFileManager.java similarity index 98% rename from bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdConfigurationFileManager.java rename to bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdConfigurationFileManager.java index 8c1238a..4682982 100644 --- a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdConfigurationFileManager.java +++ b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdConfigurationFileManager.java @@ -11,7 +11,7 @@ * Gesa Hentschke (Bachmann electronic GmbH) - initial implementation *******************************************************************************/ -package org.eclipse.cdt.lsp.clangd.internal.config; +package org.eclipse.cdt.lsp.clangd; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -26,8 +26,6 @@ import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription; -import org.eclipse.cdt.lsp.clangd.ClangdCProjectDescriptionListener; -import org.eclipse.cdt.lsp.clangd.MacroResolver; import org.eclipse.cdt.lsp.plugin.LspPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/clangd/tests/ClangdConfigurationFileManagerTest.java b/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/clangd/tests/ClangdConfigurationFileManagerTest.java index f2368b3..154c5e3 100644 --- a/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/clangd/tests/ClangdConfigurationFileManagerTest.java +++ b/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/clangd/tests/ClangdConfigurationFileManagerTest.java @@ -33,8 +33,8 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.internal.core.settings.model.CConfigurationDescriptionCache; import org.eclipse.cdt.lsp.clangd.ClangdCProjectDescriptionListener; +import org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager; import org.eclipse.cdt.lsp.clangd.MacroResolver; -import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/internal/clangd/tests/ClangdConfigFileCheckerTest.java b/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/internal/clangd/tests/ClangdConfigFileCheckerTest.java index cf4bb34..6ac1be7 100644 --- a/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/internal/clangd/tests/ClangdConfigFileCheckerTest.java +++ b/tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/internal/clangd/tests/ClangdConfigFileCheckerTest.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; +import org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager; import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigFileChecker; import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigFileMonitor; -import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager; import org.eclipse.cdt.lsp.clangd.tests.TestUtils; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker;