From 416a7f4f30fde042b0ab004013ed30908b88e236 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 21 Aug 2020 13:42:02 +0300 Subject: [PATCH] Bug 558592 - Rework access to PresentationReconcilerCPP 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 --- .../META-INF/MANIFEST.MF | 17 +++++------------ .../cquery/ui/CqueryProtocolExtension.java | 2 +- .../cquery/ui/PublishSemanticHighlighting.java | 2 +- lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF | 6 +++++- lsp/org.eclipse.cdt.lsp.ui/plugin.xml | 2 +- .../ui/text}/LineBackgroundListenerCPP.java | 3 ++- .../ui/text}/PresentationReconcilerCPP.java | 3 ++- .../internal/ui}/text/SetInactiveRegions.java | 4 ++-- 8 files changed, 19 insertions(+), 20 deletions(-) rename lsp/{org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core => org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text}/LineBackgroundListenerCPP.java (96%) rename lsp/{org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core => org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text}/PresentationReconcilerCPP.java (99%) rename lsp/{org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal => org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui}/text/SetInactiveRegions.java (96%) diff --git a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF index 809f273543f..4b9e1655a09 100644 --- a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF +++ b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF @@ -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, diff --git a/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java index 19d69e40934..156781f092b 100644 --- a/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java +++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java @@ -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; diff --git a/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java index e0fa9e1ec89..54412edbcf0 100644 --- a/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java +++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java @@ -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; diff --git a/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF index 78a7b3ec283..0545ac7e299 100644 --- a/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF +++ b/lsp/org.eclipse.cdt.lsp.ui/META-INF/MANIFEST.MF @@ -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 diff --git a/lsp/org.eclipse.cdt.lsp.ui/plugin.xml b/lsp/org.eclipse.cdt.lsp.ui/plugin.xml index f731e94fd62..bb63a4dfb79 100644 --- a/lsp/org.eclipse.cdt.lsp.ui/plugin.xml +++ b/lsp/org.eclipse.cdt.lsp.ui/plugin.xml @@ -39,7 +39,7 @@ diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/LineBackgroundListenerCPP.java similarity index 96% rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java rename to lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/LineBackgroundListenerCPP.java index 990be98127d..05a33e0ff3d 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java +++ b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/LineBackgroundListenerCPP.java @@ -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; diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/PresentationReconcilerCPP.java similarity index 99% rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java rename to lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/PresentationReconcilerCPP.java index 6ea5b48e0b4..3fad96e82bc 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java +++ b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/PresentationReconcilerCPP.java @@ -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; diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/text/SetInactiveRegions.java b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/SetInactiveRegions.java similarity index 96% rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/text/SetInactiveRegions.java rename to lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/SetInactiveRegions.java index f9dcbc80cf2..0912f7ed754 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/text/SetInactiveRegions.java +++ b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/text/SetInactiveRegions.java @@ -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;