Skip to content

Commit 6ea2982

Browse files
committed
[#242] Make ClangdConfigurationFileManager public API
since its needed by some vendors to overwrite certain methods it should be made available. part of #276
1 parent 0b3b624 commit 6ea2982

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Require-Bundle: org.eclipse.cdt.lsp;bundle-version="0.0.0",
2828
org.eclipse.ui.workbench.texteditor;bundle-version="0.0.0",
2929
org.eclipse.core.variables;bundle-version="0.0.0",
3030
org.yaml.snakeyaml;bundle-version="0.0.0"
31-
Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults.xml,
31+
Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml,
32+
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults.xml,
3233
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess.xml,
33-
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml,
3434
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdFallbackManager.xml,
3535
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml
3636
Bundle-Activator: org.eclipse.cdt.lsp.clangd.plugin.ClangdPlugin
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager">
2+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager">
33
<property name="service.ranking" type="Integer" value="0"/>
44
<service>
55
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdCProjectDescriptionListener"/>
66
</service>
77
<reference cardinality="1..1" field="build" interface="org.eclipse.cdt.core.build.ICBuildConfigurationManager" name="build"/>
8-
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager"/>
8+
<implementation class="org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager"/>
99
</scr:component>
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
1212
*******************************************************************************/
1313

14-
package org.eclipse.cdt.lsp.clangd.internal.config;
14+
package org.eclipse.cdt.lsp.clangd;
1515

1616
import java.io.ByteArrayInputStream;
1717
import java.io.IOException;
@@ -26,8 +26,6 @@
2626
import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
2727
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
2828
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
29-
import org.eclipse.cdt.lsp.clangd.ClangdCProjectDescriptionListener;
30-
import org.eclipse.cdt.lsp.clangd.MacroResolver;
3129
import org.eclipse.cdt.lsp.plugin.LspPlugin;
3230
import org.eclipse.core.resources.IFile;
3331
import org.eclipse.core.resources.IProject;

tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/clangd/tests/ClangdConfigurationFileManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
3434
import org.eclipse.cdt.internal.core.settings.model.CConfigurationDescriptionCache;
3535
import org.eclipse.cdt.lsp.clangd.ClangdCProjectDescriptionListener;
36+
import org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager;
3637
import org.eclipse.cdt.lsp.clangd.MacroResolver;
37-
import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager;
3838
import org.eclipse.core.resources.IFile;
3939
import org.eclipse.core.resources.IProject;
4040
import org.eclipse.core.resources.IResource;

tests/org.eclipse.cdt.lsp.clangd.tests/src/org/eclipse/cdt/lsp/internal/clangd/tests/ClangdConfigFileCheckerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import java.io.IOException;
2121
import java.io.UnsupportedEncodingException;
2222

23+
import org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager;
2324
import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigFileChecker;
2425
import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigFileMonitor;
25-
import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager;
2626
import org.eclipse.cdt.lsp.clangd.tests.TestUtils;
2727
import org.eclipse.core.resources.IFile;
2828
import org.eclipse.core.resources.IMarker;

0 commit comments

Comments
 (0)