8000 [#276] Refactor clangd api by ghentschke · Pull Request #285 · eclipse-cdt/cdt-lsp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[#276] Refactor clangd api #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2024
Merged

[#276] Refactor clangd api #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b825a5
[#276] Refactor clangd API
ghentschke Mar 4, 2024
558b0da
Make org.eclipse.cdt.lsp.config public API
ghentschke Mar 4, 2024
17a6236
Update comment
ghentschke Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ Automatic-Module-Name: org.eclipse.cdt.lsp.clangd
Bundle-ActivationPolicy: lazy
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.cdt.lsp.clangd;singleton:=true
Bundle-Version: 1.0.0.qualifier
Export-Package: org.eclipse.cdt.lsp.clangd;x-internal:=true,
org.eclipse.cdt.lsp.internal.clangd;x-internal:=true,
org.eclipse.cdt.lsp.internal.clangd.editor;x-internal:=true,
org.eclipse.cdt.lsp.internal.clangd.editor.expressions;x-internal:=true,
org.eclipse.cdt.lsp.internal.clangd.editor.handlers;x-internal:=true
Bundle-Version: 2.0.0.qualifier
Export-Package: org.eclipse.cdt.lsp.clangd
Import-Package: org.yaml.snakeyaml;version="1.27.0",
org.yaml.snakeyaml.error;version="1.27.0",
org.yaml.snakeyaml.scanner;version="1.27.0"
Expand All @@ -32,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.BuiltinClangdOptionsDefaults.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager.xml,
OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess.xml,
OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdFallbackManager.xml,
OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdMetadataDefaults.xml
Bundle-Activator: org.eclipse.cdt.lsp.internal.clangd.editor.ClangdPlugin
Service-Component: 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
4 changes: 2 additions & 2 deletions ...p.clangd.BuiltinClangdOptionsDefaults.xml → ...l.config.BuiltinClangdOptionsDefaults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.clangd.BuiltinClangdOptionsDefaults">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults">
<property name="service.ranking" type="Integer" value="0"/>
<service>
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults"/>
</service>
<implementation class="org.eclipse.cdt.lsp.clangd.BuiltinClangdOptionsDefaults"/>
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults"/>
</scr:component>
4 changes: 2 additions & 2 deletions ...rnal.clangd.ClangdConfigurationAccess.xml → ...rnal.config.ClangdConfigurationAccess.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess">
<service>
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdConfiguration"/>
</service>
<reference cardinality="1..1" field="metadata" interface="org.eclipse.cdt.lsp.clangd.ClangdMetadata" name="metadata"/>
<reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
<implementation class="org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess"/>
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess"/>
</scr:component>
4 changes: 2 additions & 2 deletions ...clangd.ClangdConfigurationFileManager.xml → ...config.ClangdConfigurationFileManager.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager">
<property name="service.ranking" type="Integer" value="0"/>
<service>
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdCProjectDescriptionListener"/>
</service>
<reference cardinality="1..1" field="build" interface="org.eclipse.cdt.core.build.ICBuildConfigurationManager" name="build"/>
<implementation class="org.eclipse.cdt.lsp.clangd.ClangdConfigurationFileManager"/>
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager"/>
</scr:component>
4 changes: 2 additions & 2 deletions ...internal.clangd.ClangdFallbackManager.xml → ...internal.config.ClangdFallbackManager.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.internal.clangd.ClangdFallbackManager">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.internal.config.ClangdFallbackManager">
<service>
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdFallbackFlags"/>
</service>
<reference cardinality="1..1" field="build" interface="org.eclipse.cdt.core.build.ICBuildConfigurationManager" name="build"/>
<reference cardinality="1..1" field="uri" interface="org.eclipse.cdt.lsp.editor.InitialUri" name="uri"/>
<reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
<implementation class="org.eclipse.cdt.lsp.internal.clangd.ClangdFallbackManager"/>
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdFallbackManager"/>
</scr:component>
4 changes: 2 additions & 2 deletions ...nternal.clangd.ClangdMetadataDefaults.xml → ...nternal.config.ClangdMetadataDefaults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.internal.clangd.ClangdMetadataDefaults">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults">
<service>
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdMetadata"/>
</service>
<reference cardinality="1..1" field="defaults" interface="org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults" name="defaults"/>
<implementation class="org.eclipse.cdt.lsp.internal.clangd.ClangdMetadataDefaults"/>
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults"/>
</scr:component>
8 changes: 4 additions & 4 deletions bundles/org.eclipse.cdt.lsp.clangd/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
class="org.eclipse.cdt.lsp.internal.clangd.ClangdPreferenceInitializer">
class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdPreferenceInitializer">
</initializer>
</extension>
<extension
Expand All @@ -23,7 +23,7 @@
<!-- FIXME: AF: Move commmon part to "org.eclipse.cdt.lsp[.editor]" -->
<page
category="org.eclipse.cdt.lsp.editor.preferencePage"
class="org.eclipse.cdt.lsp.internal.clangd.editor.ClangdConfigurationPage"
class="org.eclipse.cdt.lsp.clangd.internal.ui.ClangdConfigurationPage"
id="org.eclipse.cdt.lsp.clangd.editor.preferencePage"
name="%ClangdConfigurationPage.name">
</page>
Expand All @@ -32,7 +32,7 @@
point="org.eclipse.ui.propertyPages">
<page
category="org.eclipse.cdt.lsp.editor.propertyPage"
class="org.eclipse.cdt.lsp.internal.clangd.editor.ClangdConfigurationPage"
class="org.eclipse.cdt.lsp.clangd.internal.ui.ClangdConfigurationPage"
id="org.eclipse.cdt.lsp.clangd.editor.propertyPage"
name="%ClangdConfigurationPage.name">
<filter
Expand All @@ -59,7 +59,7 @@
<extension
point="org.eclipse.cdt.lsp.serverProvider">
<server
class="org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServerProvider"
class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdLanguageServerProvider"
priority="low">
</server>
</extension>
Expand Down
4 changes: 2 additions & 2 deletions ...ipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdCProjectDescriptionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

/**
* Vendors may implement this interface as OSGi service
* with a service.ranking property > 0 to implement custom behavior
* and to replace the {@link ClangdConfigurationFileManager}
* with a service.ranking property > 0 to replace the default
* implementation {@code ClangdConfigurationFileManager}
*/
public interface ClangdCProjectDescriptionListener {

Expand Down
5 changes: 3 additions & 2 deletions .../clangd/BuiltinClangdOptionsDefaults.java → .../config/BuiltinClangdOptionsDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
* Contributors:
* Dominic Scharfe (COSEDA Technologies GmbH) - initial implementation
*******************************************************************************/
package org.eclipse.cdt.lsp.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.util.Collections;
import java.util.List;
import java.util.Optional;

import org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults;
import org.eclipse.cdt.utils.PathUtil;
import org.eclipse.core.runtime.IPath;
import org.osgi.service.component.annotations.Component;
Expand Down Expand Up @@ -45,7 +46,7 @@ public boolean useBackgroundIndex() {

@Override
public String completionStyle() {
return "detailed";
return "detailed"; //$NON-NLS-1$
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...nternal/clangd/CProjectChangeMonitor.java → ...nternal/config/CProjectChangeMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
Expand Down
4 changes: 2 additions & 2 deletions ...ernal/clangd/ClangdConfigFileChecker.java → ...ernal/config/ClangdConfigFileChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.io.IOException;

import org.eclipse.cdt.lsp.internal.clangd.editor.ClangdPlugin;
import org.eclipse.cdt.lsp.clangd.plugin.ClangdPlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
Expand Down
2 changes: 1 addition & 1 deletion ...ernal/clangd/ClangdConfigFileMonitor.java → ...ernal/config/ClangdConfigFileMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.util.concurrent.ConcurrentLinkedQueue;

Expand Down
2 changes: 1 addition & 1 deletion ...nal/clangd/ClangdConfigurationAccess.java → ...nal/config/ClangdConfigurationAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Alexander Fedorov (ArSysOp) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 3 additions & 1 deletion ...langd/ClangdConfigurationFileManager.java → ...onfig/ClangdConfigurationFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand All @@ -26,6 +26,8 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion ...nternal/clangd/ClangdFallbackManager.java → ...nternal/config/ClangdFallbackManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Alexander Fedorov (ArSysOp) - rework to OSGi components
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.net.URI;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion .../clangd/ClangdLanguageServerProvider.java → .../config/ClangdLanguageServerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Alexander Fedorov (ArSysOp) - rework access to preferences
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.net.URI;
import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions ...ternal/clangd/ClangdMetadataDefaults.java → ...ternal/config/ClangdMetadataDefaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
* Contributors:
* Alexander Fedorov (ArSysOp) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.util.stream.Collectors;

import org.eclipse.cdt.lsp.clangd.ClangdMetadata;
import org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults;
import org.eclipse.cdt.lsp.internal.clangd.editor.LspEditorUiMessages;
import org.eclipse.cdt.lsp.clangd.internal.ui.LspEditorUiMessages;
import org.eclipse.core.runtime.preferences.PreferenceMetadata;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
Expand Down
2 changes: 1 addition & 1 deletion ...l/clangd/ClangdPreferenceInitializer.java → ...l/config/ClangdPreferenceInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Alexander Fedorov (ArSysOp) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import org.eclipse.cdt.lsp.clangd.ClangdConfiguration;
import org.eclipse.cdt.lsp.clangd.ClangdMetadata;
Expand Down
2 changes: 1 addition & 1 deletion ...ternal/clangd/ClangdPreferredOptions.java → ...ternal/config/ClangdPreferredOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Alexander Fedorov (ArSysOp) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.lsp.internal.clangd;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
3 changes: 2 additions & 1 deletion ...clangd/editor/CompileCommandsMonitor.java → ...ternal/config/CompileCommandsMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Dominic Scharfe (COSEDA Technologies GmbH) - initial implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd.editor;
package org.eclipse.cdt.lsp.clangd.internal.config;

import java.io.IOException;
import java.util.Arrays;
Expand All @@ -23,6 +23,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

import org.eclipse.cdt.lsp.clangd.plugin.ClangdPlugin;
import org.eclipse.cdt.lsp.util.LspUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
Expand Down
2 changes: 1 addition & 1 deletion ...langd/editor/ClangdConfigurationArea.java → .../internal/ui/ClangdConfigurationArea.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Contributors:
* Alexander Fedorov (ArSysOp) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.lsp.internal.clangd.editor;
package org.eclipse.cdt.lsp.clangd.internal.ui;

import java.io.File;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...langd/editor/ClangdConfigurationPage.java → .../internal/ui/ClangdConfigurationPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Alexander Fedorov (ArSysOp) - Initial API and implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd.editor;
package org.eclipse.cdt.lsp.clangd.internal.ui;

import java.io.IOException;

Expand Down
2 changes: 1 addition & 1 deletion ...al/clangd/editor/LspEditorUiMessages.java → ...angd/internal/ui/LspEditorUiMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd.editor;
package org.eclipse.cdt.lsp.clangd.internal.ui;

import org.eclipse.osgi.util.NLS;

Expand Down
0 ...ngd/editor/LspEditorUiMessages.properties → ...nternal/ui/LspEditorUiMessages.properties
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions .../internal/clangd/editor/ClangdPlugin.java → ...e/cdt/lsp/clangd/plugin/ClangdPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
* Alexander Fedorov (ArSysOp) - use Platform for logging
*******************************************************************************/

package org.eclipse.cdt.lsp.internal.clangd.editor;
package org.eclipse.cdt.lsp.clangd.plugin;

import org.eclipse.cdt.lsp.internal.clangd.CProjectChangeMonitor;
import org.eclipse.cdt.lsp.internal.clangd.ClangdConfigFileMonitor;
import org.eclipse.cdt.lsp.clangd.internal.config.CProjectChangeMonitor;
import org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigFileMonitor;
import org.eclipse.cdt.lsp.clangd.internal.config.CompileCommandsMonitor;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
Expand Down
2 changes: 1 addition & 1 deletion .../eclipse/cdt/lsp/internal/clangd/editor/handlers/ToggleSourceAndHeaderCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.net.URI;
import java.util.Optional;

import org.eclipse.cdt.lsp.internal.clangd.editor.ClangdPlugin;
import org.eclipse.cdt.lsp.clangd.plugin.ClangdPlugin;
import org.eclipse.cdt.lsp.plugin.LspPlugin;
import org.eclipse.cdt.lsp.services.ClangdLanguageServer;
import org.eclipse.core.commands.AbstractHandler;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF
10000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.cdt.lsp;singleton:=true
Bundle-Version: 2.0.0.qualifier
Export-Package: org.eclipse.cdt.lsp,
org.eclipse.cdt.lsp.config;x-friends:="org.eclipse.cdt.lsp.clangd",
org.eclipse.cdt.lsp.config,
org.eclipse.cdt.lsp.editor,
org.eclipse.cdt.lsp.plugin;x-friends:="org.eclipse.cdt.lsp.clangd",
org.eclipse.cdt.lsp.server,
Expand Down
2 changes: 1 addition & 1 deletion ...clangd.tests/src/org/eclipse/cdt/lsp/clangd/tests/ClangdConfigurationFileManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...angd.tests/src/org/eclipse/cdt/lsp/internal/clangd/tests/ClangdConfigFileCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
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.cdt.lsp.internal.clangd.ClangdConfigFileChecker;
import org.eclipse.cdt.lsp.internal.clangd.ClangdConfigFileMonitor;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
Expand Down
0