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 558592 - Rework access to PresentationReconcilerCPP

Browse source 
Move UI code to LSP UI bundle. Remove unused UI dependencies from LSP
Core bundle.
The Activator rework will follow with another Gerrit.

Change-Id: Ifb7e4d153dab6dcc7d50fdf60c2f22333abbb8ed
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
This commit is contained in:
Alexander Fedorov 2020-08-21 13:42:02 +03:00
parent 2effd41b14
commit 416a7f4f30
8 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,22 +7,15 @@ 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.core.runtime,
org.eclipse.core.commands,
org.eclipse.core.expressions,
org.eclipse.cdt.core,
org.eclipse.core.resources,
org.eclipse.jface,
org.eclipse.jface.text,
org.eclipse.ui,
org.eclipse.ui.genericeditor;bundle-version="1.0.0",
org.eclipse.lsp4j,
org.eclipse.core.runtime,
org.eclipse.lsp4e,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc,
org.eclipse.osgi.services;bundle-version="3.9.0";resolution:=optional,
org.eclipse.cdt.core,
org.eclipse.cdt.ui
Import-Package: org.eclipse.ui.editors.text,
org.eclipse.ui.texteditor
org.eclipse.text,
org.eclipse.ui
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,

2
lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java
View file

@ -16,8 +16,8 @@ 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.cdt.lsp.internal.ui.text.SetInactiveRegions;
import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
import org.osgi.service.component.annotations.Component;

2
lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java
View file

@ -18,10 +18,10 @@ import java.util.function.Consumer;
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.lsp.internal.ui.text.PresentationReconcilerCPP;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.jface.preference.IPreferenceStore;

6
lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF
View file

@ -7,15 +7,19 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.osgi;bundle-version="[3.15.0,4.0.0)",
org.eclipse.core.resources;bundle-version="3.13.800",
org.eclipse.core.runtime;bundle-version="3.19.0",
org.eclipse.equinox.preferences;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jface.text;bundle-version="3.16.0",
org.eclipse.ui;bundle-version="[3.115.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="3.13.300",
org.eclipse.lsp4e;bundle-version="0.13.1",
org.eclipse.lsp4j;bundle-version="0.9.0",
org.eclipse.cdt.core;bundle-version="6.10.0",
org.eclipse.cdt.ui;bundle-version="6.6.0",
org.eclipse.cdt.lsp.core;bundle-version="[1.1.0,2.0.0)"
Export-Package: org.eclipse.cdt.lsp.internal.ui;x-internal:=true,
org.eclipse.cdt.lsp.internal.ui.preferences;x-internal:=true
org.eclipse.cdt.lsp.internal.ui.preferences;x-internal:=true,
org.eclipse.cdt.lsp.internal.ui.text
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.cdt.lsp.internal.ui.LspUiActivator

2
lsp/org.eclipse.cdt.lsp.ui/plugin.xml
View file

@ -39,7 +39,7 @@
<extension
point="org.eclipse.ui.genericeditor.presentationReconcilers">
<presentationReconciler
class="org.eclipse.cdt.lsp.core.PresentationReconcilerCPP"
class="org.eclipse.cdt.lsp.internal.ui.text.PresentationReconcilerCPP"
contentType="org.eclipse.cdt.lsp.core">
</presentationReconciler>
</extension>

3
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java → lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/LineBackgroundListenerCPP.java
View file

@ -9,9 +9,10 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.lsp.core;
package org.eclipse.cdt.lsp.internal.ui.text;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.lsp.core.Activator;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.jface.text.BadLocationException;

3
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java → lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/PresentationReconcilerCPP.java
View file

@ -18,7 +18,7 @@
* Manish Khurana
*******************************************************************************/
package org.eclipse.cdt.lsp.core;
package org.eclipse.cdt.lsp.internal.ui.text;
import java.net.URI;
import java.util.ArrayList;
@ -40,6 +40,7 @@ import org.eclipse.cdt.internal.ui.text.CPresentationReconciler;
import org.eclipse.cdt.internal.ui.text.PartitionDamager;
import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner;
import org.eclipse.cdt.internal.ui.text.TokenStore;
import org.eclipse.cdt.lsp.core.Activator;
import org.eclipse.cdt.lsp.internal.text.ResolveDocumentUri;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.ILanguageUI;

4
lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/text/SetInactiveRegions.java → lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/SetInactiveRegions.java
View file

@ -7,7 +7,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.cdt.lsp.internal.text;
package org.eclipse.cdt.lsp.internal.ui.text;
import java.net.URI;
import java.util.Collection;
@ -16,7 +16,7 @@ import java.util.function.BiConsumer;
import java.util.function.Supplier;
import org.eclipse.cdt.lsp.core.Activator;
import org.eclipse.cdt.lsp.core.PresentationReconcilerCPP;
import org.eclipse.cdt.lsp.internal.text.ResolveDocumentUri;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.BadPositionCategoryException;
import org.eclipse.jface.text.IDocument;