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

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

Part 11:
Move cquery code to org.eclipse.cdt.lsp.cquery bundle.

Change-Id: I079f08c1aa1c177abdc291402931f7547ab325bf
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
This commit is contained in:
Alexander Fedorov 2020-08-20 12:14:32 +03:00
parent b8427cb54a
commit fa03b9225b
23 changed files with 81 additions and 76 deletions

View file

@ -7,6 +7,7 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.google.gson;bundle-version="2.8.2",
org.eclipse.cdt.lsp.cquery;bundle-version="0.1.0",
org.junit,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc,

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -9,21 +9,21 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.lsp.core.tests.cquery;
package org.eclipse.cdt.lsp.cquery.tests;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.eclipse.cdt.cquery.CqueryInactiveRegions;
import org.eclipse.cdt.cquery.CquerySemanticHighlights;
import org.eclipse.cdt.cquery.ExtendedSymbolKindType;
import org.eclipse.cdt.cquery.HighlightSymbol;
import org.eclipse.cdt.cquery.IndexingProgressStats;
import org.eclipse.cdt.cquery.StorageClass;
import org.eclipse.cdt.cquery.SymbolRole;
import org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension;
import org.eclipse.cdt.lsp.internal.cquery.CqueryInactiveRegions;
import org.eclipse.cdt.lsp.internal.cquery.CquerySemanticHighlights;
import org.eclipse.cdt.lsp.internal.cquery.ExtendedSymbolKindType;
import org.eclipse.cdt.lsp.internal.cquery.HighlightSymbol;
import org.eclipse.cdt.lsp.internal.cquery.IndexingProgressStats;
import org.eclipse.cdt.lsp.internal.cquery.StorageClass;
import org.eclipse.cdt.lsp.internal.cquery.SymbolRole;
import org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension;
import org.eclipse.lsp4j.Position;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.jsonrpc.json.JsonRpcMethod;

View file

@ -23,16 +23,11 @@ Require-Bundle: com.google.gson;bundle-version="2.8.2",
org.eclipse.cdt.ui
Import-Package: org.eclipse.ui.editors.text,
org.eclipse.ui.texteditor
Export-Package: org.eclipse.cdt.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.lsp;x-friends:="org.eclipse.cdt.lsp.ui,org.eclipse.cdt.lsp.clangd",
Export-Package: 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.internal.core;x-internal:=true,
org.eclipse.cdt.lsp.internal.text;x-friends:="org.eclipse.cdt.lsp.ui"
Bundle-Activator: org.eclipse.cdt.lsp.core.Activator
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedLanguageServers.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.internal.cquery.ui.CqueryProtocolExtension.xml
OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedProtocolExtensions.xml

View file

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

View file

@ -6,3 +6,18 @@ Bundle-Version: 0.1.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.google.gson;bundle-version="2.8.2",
org.eclipse.cdt.lsp.core;bundle-version="1.1.100",
org.eclipse.cdt.lsp.ui;bundle-version="0.1.100",
org.eclipse.cdt.ui;bundle-version="7.0.0",
org.eclipse.core.runtime;bundle-version="3.19.0",
org.eclipse.jface.text;bundle-version="3.16.400",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.9.0",
org.eclipse.lsp4j;bundle-version="0.9.0",
org.eclipse.osgi.services;bundle-version="3.9.0";resolution:=optional,
org.eclipse.ui;bundle-version="3.118.0"
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer.xml,
OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension.xml
Export-Package: org.eclipse.cdt.lsp.internal.cquery;x-internal:=true,
org.eclipse.cdt.lsp.internal.cquery.ui;x-internal:=true

View file

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

View file

@ -1,7 +1,7 @@
<?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.cquery.ui.CqueryProtocolExtension">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension">
<service>
<provide interface="org.eclipse.cdt.lsp.LanguageProtocolExtension"/>
</service>
<implementation class="org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension"/>
<implementation class="org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension"/>
</scr:component>

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import java.net.URI;
import java.util.List;

View file

@ -7,13 +7,13 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.internal.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import org.eclipse.osgi.util.NLS;
public class CqueryMessages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.cquery.CqueryMessages"; //$NON-NLS-1$
private static final String BUNDLE_NAME = "org.eclipse.cdt.lsp.internal.cquery.CqueryMessages"; //$NON-NLS-1$
static {
// initialize resource bundle
@ -22,7 +22,6 @@ public class CqueryMessages extends NLS {
public static String CqueryLanguageServer_label;
public static String CquerySymbolKind_e_illegal_value;
public static String Server2ClientProtocolExtension_cquery_name;
public static String StorageClass_e_illegal_value;
private CqueryMessages() {

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import java.net.URI;
import java.util.List;

View file

@ -1,19 +1,14 @@
/*******************************************************************************
* Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0/.
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Manish Khurana <mkmanishkhurana98@gmail.com> - initial API and implementation
* Nathan Ridge <zeratul976@hotmail.com> - initial API and implementation
* Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
*******************************************************************************/
package org.eclipse.cdt.internal.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import org.eclipse.osgi.util.NLS;

View file

@ -1,23 +1,17 @@
/*******************************************************************************
* Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0/.
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Manish Khurana <mkmanishkhurana98@gmail.com> - initial API and implementation
* Nathan Ridge <zeratul976@hotmail.com> - initial API and implementation
* Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import java.lang.reflect.Type;
import org.eclipse.cdt.internal.cquery.CquerySymbolKind;
import org.eclipse.lsp4j.SymbolKind;
import com.google.gson.JsonDeserializationContext;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import java.util.List;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
public class IndexingProgressStats {
private int indexRequestCount;

View file

@ -1,21 +1,15 @@
/*******************************************************************************
* Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0/.
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Manish Khurana <mkmanishkhurana98@gmail.com> - initial API and implementation
* Nathan Ridge <zeratul976@hotmail.com> - initial API and implementation
* Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
import org.eclipse.cdt.internal.cquery.CqueryMessages;
import org.eclipse.osgi.util.NLS;
public enum StorageClass {

View file

@ -1,12 +1,14 @@
/*******************************************************************************
* Copyright (c) 2018 Nathan Ridge and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
* Copyright (c) 2018, 2020 Nathan Ridge and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0/.
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.cquery;
package org.eclipse.cdt.lsp.internal.cquery;
/**
* A class to contain constants that represent different roles

View file

@ -9,12 +9,13 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.internal.cquery;
package org.eclipse.cdt.lsp.internal.cquery.ui;
import java.net.URI;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.lsp.LanguageServerConfiguration;
import org.eclipse.cdt.lsp.internal.cquery.CqueryMessages;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@ -22,6 +23,7 @@ import org.osgi.service.component.annotations.Component;
import com.google.gson.JsonObject;
@SuppressWarnings("restriction")
@Component
public class CqueryLanguageServer implements LanguageServerConfiguration {

View file

@ -8,19 +8,20 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.internal.cquery.ui;
package org.eclipse.cdt.lsp.internal.cquery.ui;
import org.eclipse.cdt.cquery.CqueryInactiveRegions;
import org.eclipse.cdt.cquery.CquerySemanticHighlights;
import org.eclipse.cdt.cquery.IndexingProgressStats;
import org.eclipse.cdt.internal.cquery.CqueryMessages;
import org.eclipse.cdt.lsp.LanguageProtocolExtension;
import org.eclipse.cdt.lsp.internal.core.ShowStatus;
import org.eclipse.cdt.lsp.internal.cquery.CqueryInactiveRegions;
import org.eclipse.cdt.lsp.internal.cquery.CqueryMessages;
import org.eclipse.cdt.lsp.internal.cquery.CquerySemanticHighlights;
import org.eclipse.cdt.lsp.internal.cquery.IndexingProgressStats;
import org.eclipse.cdt.lsp.internal.text.SetInactiveRegions;
import org.eclipse.cdt.lsp.internal.ui.StatusLineMessage;
import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
import org.osgi.service.component.annotations.Component;
@SuppressWarnings("restriction")
@Component
public class CqueryProtocolExtension implements LanguageProtocolExtension {

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
* Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
@ -7,19 +7,20 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.internal.cquery.ui;
package org.eclipse.cdt.lsp.internal.cquery.ui;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.cdt.cquery.ExtendedSymbolKindType;
import org.eclipse.cdt.cquery.StorageClass;
import org.eclipse.cdt.cquery.SymbolRole;
import org.eclipse.cdt.internal.cquery.CquerySymbolKind;
import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings;
import org.eclipse.cdt.lsp.internal.cquery.CquerySymbolKind;
import org.eclipse.cdt.lsp.internal.cquery.ExtendedSymbolKindType;
import org.eclipse.cdt.lsp.internal.cquery.StorageClass;
import org.eclipse.cdt.lsp.internal.cquery.SymbolRole;
import org.eclipse.lsp4j.SymbolKind;
//FIXME: AF: rework this compilation unit from a container of static functions to a normal type
@SuppressWarnings("restriction")
public class HighlightingNames {
private static Map<Integer, String> semanticHighlightSymbolsMap = new HashMap<>();

View file

@ -7,7 +7,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.internal.cquery.ui;
package org.eclipse.cdt.lsp.internal.cquery.ui;
import java.net.URI;
import java.util.ArrayList;
@ -15,12 +15,12 @@ import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import org.eclipse.cdt.cquery.CquerySemanticHighlights;
import org.eclipse.cdt.cquery.HighlightSymbol;
import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition;
import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle;
import org.eclipse.cdt.lsp.core.Activator;
import org.eclipse.cdt.lsp.core.PresentationReconcilerCPP;
import org.eclipse.cdt.lsp.internal.cquery.CquerySemanticHighlights;
import org.eclipse.cdt.lsp.internal.cquery.HighlightSymbol;
import org.eclipse.cdt.lsp.internal.text.ResolveDocumentUri;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
@ -38,6 +38,7 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
//FIXME: needs more work
@SuppressWarnings("restriction")
public class PublishSemanticHighlighting implements Consumer<CquerySemanticHighlights> {
private final ResolveDocumentUri uri;