mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 558664 - cquery and clangd: registered each LS from its own bundle

Browse source 
Part 10:
Move clangd code to org.eclipse.cdt.lsp.clangd bundle.

Change-Id: Ib2938ea34a4996a535658decc61a725f4626c649
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
This commit is contained in:
Alexander Fedorov 2020-08-20 11:19:25 +03:00
parent 1fb6efa9c3
commit b8427cb54a
8 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lsp/org.eclipse.cdt.lsp.clangd/.project
View file

@ -20,6 +20,11 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>

5
lsp/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
View file

@ -6,3 +6,8 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Name: %Bundle-Name Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer.xml
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.cdt.lsp.core;bundle-version="1.1.100",
org.eclipse.osgi.services;bundle-version="3.9.0";resolution:=optional,
org.eclipse.osgi;bundle-version="3.16.0"

4
lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.clangd.ClangdLanguageServer.xml → lsp/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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.internal.clangd.ClangdLanguageServer"> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer">
<service> <service>
<provide interface="org.eclipse.cdt.lsp.LanguageServerConfiguration"/> <provide interface="org.eclipse.cdt.lsp.LanguageServerConfiguration"/>
</service> </service>
<implementation class="org.eclipse.cdt.internal.clangd.ClangdLanguageServer"/> <implementation class="org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer"/>
</scr:component> </scr:component>

0
lsp/org.eclipse.cdt.lsp.clangd/src/.gitkeep
View file

2
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdLanguageServer.java → lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdLanguageServer.java
View file

@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.clangd; package org.eclipse.cdt.lsp.internal.clangd;
import java.net.URI; import java.net.URI;

9
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.java → lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.java
View file

@ -11,18 +11,21 @@
* Contributors: * Contributors:
* Alexander Fedorov (ArSysOp) - initial API and implementation * Alexander Fedorov (ArSysOp) - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.clangd; package org.eclipse.cdt.lsp.internal.clangd;
import org.eclipse.osgi.util.NLS; import org.eclipse.osgi.util.NLS;
public class ClangdMessages extends NLS { public class ClangdMessages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.clangd.ClangdMessages"; //$NON-NLS-1$
public static String ClangdLanguageServer_label; private static final String BUNDLE_NAME = "org.eclipse.cdt.lsp.internal.clangd.ClangdMessages"; //$NON-NLS-1$
static { static {
// initialize resource bundle // initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, ClangdMessages.class); NLS.initializeMessages(BUNDLE_NAME, ClangdMessages.class);
} }
public static String ClangdLanguageServer_label;
private ClangdMessages() { private ClangdMessages() {
} }
} }

0
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.properties → lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.properties
View file

4
lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
View file

@ -24,17 +24,15 @@ Require-Bundle: com.google.gson;bundle-version="2.8.2",
Import-Package: org.eclipse.ui.editors.text, Import-Package: org.eclipse.ui.editors.text,
org.eclipse.ui.texteditor org.eclipse.ui.texteditor
Export-Package: org.eclipse.cdt.cquery;x-friends:="org.eclipse.cdt.lsp.ui", Export-Package: org.eclipse.cdt.cquery;x-friends:="org.eclipse.cdt.lsp.ui",
org.eclipse.cdt.internal.clangd;x-friends:="org.eclipse.cdt.lsp.ui",
org.eclipse.cdt.internal.cquery;x-friends:="org.eclipse.cdt.lsp.ui", org.eclipse.cdt.internal.cquery;x-friends:="org.eclipse.cdt.lsp.ui",
org.eclipse.cdt.internal.cquery.ui;x-internal:=true, org.eclipse.cdt.internal.cquery.ui;x-internal:=true,
org.eclipse.cdt.lsp;x-friends:="org.eclipse.cdt.lsp.ui", org.eclipse.cdt.lsp;x-friends:="org.eclipse.cdt.lsp.ui,org.eclipse.cdt.lsp.clangd",
org.eclipse.cdt.lsp.core;x-friends:="org.eclipse.cdt.lsp.ui", org.eclipse.cdt.lsp.core;x-friends:="org.eclipse.cdt.lsp.ui",
org.eclipse.cdt.lsp.internal.core;x-internal:=true, org.eclipse.cdt.lsp.internal.core;x-internal:=true,
org.eclipse.cdt.lsp.internal.text;x-friends:="org.eclipse.cdt.lsp.ui" org.eclipse.cdt.lsp.internal.text;x-friends:="org.eclipse.cdt.lsp.ui"
Bundle-Activator: org.eclipse.cdt.lsp.core.Activator Bundle-Activator: org.eclipse.cdt.lsp.core.Activator
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedLanguageServers.xml, Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedLanguageServers.xml,
OSGI-INF/org.eclipse.cdt.internal.clangd.ClangdLanguageServer.xml,
OSGI-INF/org.eclipse.cdt.internal.cquery.CqueryLanguageServer.xml, OSGI-INF/org.eclipse.cdt.internal.cquery.CqueryLanguageServer.xml,
OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedProtocolExtensions.xml, OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedProtocolExtensions.xml,
OSGI-INF/org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension.xml OSGI-INF/org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension.xml