Skip to content
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

Jump to bottom

SLE-920: Enhance the extension point for diff viewers #723

Merged
merged 2 commits into from
Aug 20, 2024
Merged

SLE-920: Enhance the extension point for diff viewers #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b81288
SLE-920: Enhance the extension point for diff viewers
thahnen Aug 19, 2024
a641499
SLE-920: Move EP to the UI plug-in
thahnen Aug 20, 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
5 changes: 4 additions & 1 deletion org.sonarlint.eclipse.cdt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.core;resolution:=optional,
org.eclipse.cdt.ui;resolution:=optional,
org.sonarlint.eclipse.core,
org.sonarlint.eclipse.ui,
org.eclipse.core.filesystem,
org.eclipse.jdt.annotation;resolution:=optional,
org.eclipse.text
org.eclipse.text,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what do these lines do? just curious

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is basically the Eclipse way of defining dependencies at runtime (and therefore also compile time).

The MANIFEST.MF and specifically this section will contain all bundles that we require at the runtime of the Eclipse installation. Most of them are present due to them being part of the Eclipse platform itself, but for some we have an optional.

E.g. here we have the org.eclipse.cdt.core;resolution:=optional statement that more or less is used for us to only make use of this very sub-plugin if CDT (the C development tools) are installed.

What I added is the compare bundle that brings in the TextMergeViewer and SWT that is the UI system of Eclipse.

org.eclipse.compare,
org.eclipse.swt
Import-Package: org.eclipse.ui.texteditor,
org.eclipse.jface.preference
Export-Package: org.sonarlint.eclipse.cdt.internal;x-friends:="org.sonarlint.eclipse.core.tests"
Expand Down
2 changes: 1 addition & 1 deletion org.sonarlint.eclipse.cdt/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</provider>
</extension>
<extension
point="org.sonarlint.eclipse.core.syntaxHighlightingProvider">
point="org.sonarlint.eclipse.ui.syntaxHighlightingProvider">
<enhancer
class="org.sonarlint.eclipse.cdt.internal.CProjectConfiguratorExtension">
</enhancer>
Expand Down
45 changes: 36 additions & 9 deletions ...int.eclipse.cdt/src/org/sonarlint/eclipse/cdt/internal/CProjectConfiguratorExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,24 @@
import java.util.Set;
import org.eclipse.cdt.core.CCProjectNature;
import org.eclipse.cdt.core.CProjectNature;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.widgets.Composite;
import org.sonarlint.eclipse.core.SonarLintLogger;
import org.sonarlint.eclipse.core.analysis.IAnalysisConfigurator;
import org.sonarlint.eclipse.core.analysis.IFileLanguageProvider;
import org.sonarlint.eclipse.core.analysis.IPreAnalysisContext;
import org.sonarlint.eclipse.core.analysis.SonarLintLanguage;
import org.sonarlint.eclipse.core.resource.ISonarLintFile;
import org.sonarlint.eclipse.core.resource.ISonarLintProject;
import org.sonarlint.eclipse.core.rule.ISyntaxHighlightingProvider;
import org.sonarlint.eclipse.ui.rule.ISyntaxHighlightingProvider;

/**
* Responsible for checking at runtime if CDT plugin is installed.
Expand All @@ -64,6 +67,15 @@ private static boolean isCdtPresent() {
}
}

private static boolean isCdtUiPresent() {
try {
Class.forName("org.eclipse.cdt.ui.CUIPlugin");
return true;
} catch (ClassNotFoundException e) {
return false;
}
}

@Override
public Set<SonarLintLanguage> enableLanguages() {
// Objective-C is not supported by CDT!
Expand Down Expand Up @@ -101,19 +113,34 @@ public SonarLintLanguage language(ISonarLintFile file) {
return null;
}

/**
* We can only provide UI elements if the language matches C/C++ and the CDT UI plug-in is available as in some
* cases there might only be the core bundles present. This might be the case for thrid-party plug-ins that make
* use of the CDT core in order to work with C/C++ but provide their own "frontend".
*/
private static boolean canProvideUiElements(String ruleLanguage) {
return isCdtUiPresent() && (ruleLanguage.equals(C_LANGUAGE_KEY) || ruleLanguage.equals(CPP_LANGUAGE_KEY));
}

@Override
public Optional<SourceViewerConfiguration> sourceViewerConfiguration(String ruleLanguage) {
if (isCdtPresent() && (ruleLanguage.equals(C_LANGUAGE_KEY) || ruleLanguage.equals(CPP_LANGUAGE_KEY))) {
return Optional.of(CdtUiUtils.sourceViewerConfiguration());
}
return Optional.empty();
return canProvideUiElements(ruleLanguage)
? Optional.of(CdtUiUtils.sourceViewerConfiguration())
: Optional.empty();
}

@Override
public Optional<IDocumentPartitioner> documentPartitioner(String ruleLanguage) {
if (isCdtPresent() && (ruleLanguage.equals(C_LANGUAGE_KEY) || ruleLanguage.equals(CPP_LANGUAGE_KEY))) {
return Optional.of(CdtUiUtils.documentPartitioner());
}
return Optional.empty();
return canProvideUiElements(ruleLanguage)
? Optional.of(CdtUiUtils.documentPartitioner())
: Optional.empty();
}

@Nullable
@Override
public TextMergeViewer getTextMergeViewer(String ruleLanguage, Composite parent, CompareConfiguration mp) {
return canProvideUiElements(ruleLanguage)
? CdtUiUtils.getTextMergeViewer(parent, mp)
: null;
}
}
8 changes: 8 additions & 0 deletions org.sonarlint.eclipse.cdt/src/org/sonarlint/eclipse/cdt/internal/CdtUiUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@
*/
package org.sonarlint.eclipse.cdt.internal;

import org.eclipse.cdt.internal.ui.compare.CMergeViewer;
import org.eclipse.cdt.internal.ui.text.doctools.DocCommentOwnerManager;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.text.CSourceViewerConfiguration;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.widgets.Composite;

public class CdtUiUtils {

Expand All @@ -42,4 +46,8 @@ public static IDocumentPartitioner documentPartitioner() {
var owner = DocCommentOwnerManager.getInstance().getWorkspaceCommentOwner();
return CUIPlugin.getDefault().getTextTools().createDocumentPartitioner(owner);
}

public static TextMergeViewer getTextMergeViewer(Composite parent, CompareConfiguration mp) {
return new CMergeViewer(parent, 0, mp);
}
}
3 changes: 1 addition & 2 deletions org.sonarlint.eclipse.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ Export-Package: org.sonarlint.eclipse.core,
org.sonarlint.eclipse.core.internal.utils;x-friends:="org.sonarlint.eclipse.cdt,org.sonarlint.eclipse.core.tests,org.sonarlint.eclipse.jdt,org.sonarlint.eclipse.m2e,org.sonarlint.eclipse.buildship,org.sonarlint.eclipse.ui",
org.sonarlint.eclipse.core.internal.vcs;x-friends:="org.sonarlint.eclipse.ui",
org.sonarlint.eclipse.core.listener,
org.sonarlint.eclipse.core.resource,
org.sonarlint.eclipse.core.rule
org.sonarlint.eclipse.core.resource
Require-Bundle: org.eclipse.equinox.security,
org.eclipse.core.runtime;bundle-version="3.14.0",
org.eclipse.core.resources,
Expand Down
3 changes: 0 additions & 3 deletions org.sonarlint.eclipse.core/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<extension-point id="analysisConfigurator" name="SonarLint Analysis Configurator" schema="schema/analysisConfigurator.exsd"/>
<extension-point id="languageProvider" name="SonarLint File Language Provider" schema="schema/languageProvider.exsd"/>
<extension-point id="typeProvider" name="SonarLint File Type Provider" schema="schema/typeProvider.exsd"/>
<extension-point id="syntaxHighlightingProvider"
name="SonarLint Syntax Highlighting Provider"
schema="schema/syntaxHighlightingProvider.exsd"/>
<extension-point id="projectHierarchyProvider"
name="SonarLint Project Hierarchy Provider"
schema="schema/projectHierarchyProvider.exsd" />
Expand Down
11 changes: 2 additions & 9 deletions ...pse.core/src/org/sonarlint/eclipse/core/internal/extension/SonarLintExtensionTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@
import org.sonarlint.eclipse.core.analysis.IFileLanguageProvider;
import org.sonarlint.eclipse.core.analysis.IFileTypeProvider;
import org.sonarlint.eclipse.core.configurator.ProjectConfigurator;
import org.sonarlint.eclipse.core.resource.ISonarLintProjectHierarchyProvider;
import org.sonarlint.eclipse.core.resource.ISonarLintFileAdapterParticipant;
import org.sonarlint.eclipse.core.resource.ISonarLintProjectAdapterParticipant;
import org.sonarlint.eclipse.core.resource.ISonarLintProjectHierarchyProvider;
import org.sonarlint.eclipse.core.resource.ISonarLintProjectsProvider;
import org.sonarlint.eclipse.core.rule.ISyntaxHighlightingProvider;

public class SonarLintExtensionTracker extends AbstractSonarLintExtensionTracker {

Expand All @@ -43,13 +42,11 @@ public class SonarLintExtensionTracker extends AbstractSonarLintExtensionTracker
"org.sonarlint.eclipse.core.projectAdapterParticipant"); //$NON-NLS-1$
private final SonarLintEP<IFileLanguageProvider> languageEp = new SonarLintEP<>("org.sonarlint.eclipse.core.languageProvider"); //$NON-NLS-1$
private final SonarLintEP<IFileTypeProvider> typeEp = new SonarLintEP<>("org.sonarlint.eclipse.core.typeProvider"); //$NON-NLS-1$
private final SonarLintEP<ISyntaxHighlightingProvider> syntaxHighlightingProviderEP = new SonarLintEP<>(
"org.sonarlint.eclipse.core.syntaxHighlightingProvider"); //$NON-NLS-1$
private final SonarLintEP<ISonarLintProjectHierarchyProvider> projectHierarchyProviderEP = new SonarLintEP<>(
"org.sonarlint.eclipse.core.projectHierarchyProvider"); //$NON-NLS-1$

private final Collection<SonarLintEP<?>> allEps = List.of(configuratorEp, analysisEp, projectsProviderEp, fileAdapterParticipantEp, projectAdapterParticipantEp,
languageEp, typeEp, syntaxHighlightingProviderEP, projectHierarchyProviderEP);
languageEp, typeEp, projectHierarchyProviderEP);

private SonarLintExtensionTracker() {
init(allEps);
Expand Down Expand Up @@ -96,10 +93,6 @@ public Collection<IFileTypeProvider> getTypeProviders() {
return typeEp.getInstances();
}

public Collection<ISyntaxHighlightingProvider> getSyntaxHighlightingProvider() {
return syntaxHighlightingProviderEP.getInstances();
}

public Collection<ISonarLintProjectHierarchyProvider> getProjectHierarchyProviders() {
return projectHierarchyProviderEP.getInstances();
}
Expand Down
1 change: 1 addition & 0 deletions org.sonarlint.eclipse.jdt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.ui;resolution:=optional,
org.sonarlint.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.compare,
org.eclipse.swt
Import-Package: org.eclipse.ui.texteditor,
org.eclipse.jface.preference
Expand Down
2 changes: 1 addition & 1 deletion org.sonarlint.eclipse.jdt/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</enhancer>
</extension>
<extension
point="org.sonarlint.eclipse.core.syntaxHighlightingProvider">
point="org.sonarlint.eclipse.ui.syntaxHighlightingProvider">
<enhancer
class="org.sonarlint.eclipse.jdt.internal.JavaProjectConfiguratorExtension">
</enhancer>
Expand Down
14 changes: 13 additions & 1 deletion ....eclipse.jdt/src/org/sonarlint/eclipse/jdt/internal/JavaProjectConfiguratorExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,26 @@
import java.util.EnumSet;
import java.util.Optional;
import java.util.Set;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.widgets.Composite;
import org.sonarlint.eclipse.core.analysis.IAnalysisConfigurator;
import org.sonarlint.eclipse.core.analysis.IFileTypeProvider;
import org.sonarlint.eclipse.core.analysis.IPreAnalysisContext;
import org.sonarlint.eclipse.core.analysis.SonarLintLanguage;
import org.sonarlint.eclipse.core.resource.ISonarLintFile;
import org.sonarlint.eclipse.core.resource.ISonarLintFileAdapterParticipant;
import org.sonarlint.eclipse.core.resource.ISonarLintProject;
import org.sonarlint.eclipse.core.rule.ISyntaxHighlightingProvider;
import org.sonarlint.eclipse.ui.quickfixes.IMarkerResolutionEnhancer;
import org.sonarlint.eclipse.ui.quickfixes.ISonarLintMarkerResolver;
import org.sonarlint.eclipse.ui.rule.ISyntaxHighlightingProvider;

public class JavaProjectConfiguratorExtension
implements IAnalysisConfigurator, ISonarLintFileAdapterParticipant, IFileTypeProvider, IMarkerResolutionEnhancer, ISyntaxHighlightingProvider {
Expand Down Expand Up @@ -128,4 +131,13 @@ public Optional<IDocumentPartitioner> documentPartitioner(String ruleLanguage) {
}
return Optional.empty();
}

@Nullable
@Override
public TextMergeViewer getTextMergeViewer(String ruleLanguage, Composite parent, CompareConfiguration mp) {
if (jdtUiPresent && ruleLanguage.equals(JAVA_LANGUAGE_KEY)) {
return JdtUiUtils.getTextMergeViewer(parent, mp);
}
return null;
}
}
8 changes: 8 additions & 0 deletions org.sonarlint.eclipse.jdt/src/org/sonarlint/eclipse/jdt/internal/JdtUiUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@
*/
package org.sonarlint.eclipse.jdt.internal;

import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.core.resources.IMarker;
import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.compare.JavaMergeViewer;
import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
import org.eclipse.jdt.ui.text.IJavaPartitions;
import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.rules.FastPartitioner;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.swt.widgets.Composite;
import org.sonarlint.eclipse.core.internal.utils.CompatibilityUtils;
import org.sonarlint.eclipse.ui.quickfixes.ISonarLintMarkerResolver;

Expand All @@ -52,4 +56,8 @@ public static IDocumentPartitioner documentPartitioner() {
IJavaPartitions.JAVA_STRING, IJavaPartitions.JAVA_CHARACTER, IJavaPartitions.JAVA_MULTI_LINE_STRING
});
}

public static TextMergeViewer getTextMergeViewer(Composite parent, CompareConfiguration mp) {
return new JavaMergeViewer(parent, 0, mp);
}
}
2 changes: 1 addition & 1 deletion org.sonarlint.eclipse.pydev/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin>
<extension
point="org.sonarlint.eclipse.core.syntaxHighlightingProvider">
point="org.sonarlint.eclipse.ui.syntaxHighlightingProvider">
<enhancer
class="org.sonarlint.eclipse.pydev.internal.PythonProjectConfiguratorExtension">
</enhancer>
Expand Down
2 changes: 1 addition & 1 deletion ...se.pydev/src/org/sonarlint/eclipse/pydev/internal/PythonProjectConfiguratorExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Optional;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.sonarlint.eclipse.core.rule.ISyntaxHighlightingProvider;
import org.sonarlint.eclipse.ui.rule.ISyntaxHighlightingProvider;

public class PythonProjectConfiguratorExtension implements ISyntaxHighlightingProvider {
private static final String PYTHON_LANGUAGE_KEY = "py";
Expand Down
4 changes: 3 additions & 1 deletion org.sonarlint.eclipse.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.team.core,
org.eclipse.jdt.annotation;resolution:=optional,
org.eclipse.text,
org.eclipse.compare,
org.eclipse.core.expressions,
org.sonarsource.sonarlint.core.sonarlint-java-client-osgi;bundle-version="[10.4.0,10.5.0)"
Export-Package: org.sonarlint.eclipse.ui.internal;x-friends:="org.sonarlint.eclipse.core.tests",
Expand All @@ -35,7 +36,8 @@ Export-Package: org.sonarlint.eclipse.ui.internal;x-friends:="org.sonarlint.ecli
org.sonarlint.eclipse.ui.internal.properties;x-friends:="org.sonarlint.eclipse.core.tests",
org.sonarlint.eclipse.ui.internal.util;x-friends:="org.sonarlint.eclipse.core.tests",
org.sonarlint.eclipse.ui.internal.views.issues;x-friends:="org.sonarlint.eclipse.its",
org.sonarlint.eclipse.ui.quickfixes;x-internal:=true
org.sonarlint.eclipse.ui.quickfixes;x-internal:=true,
org.sonarlint.eclipse.ui.rule
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Bundle-Localization: OSGI-INF/l10n/bundle
3 changes: 3 additions & 0 deletions org.sonarlint.eclipse.ui/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
<?eclipse version="3.0"?>
<plugin>
<extension-point id="markerResolutionEnhancer" name="SonarLint Marker Resolution Enhancer" schema="schema/markerResolutionEnhancer.exsd"/>
<extension-point id="syntaxHighlightingProvider"
name="SonarLint Syntax Highlighting Provider"
schema="schema/syntaxHighlightingProvider.exsd"/>

<!-- Extensions -->

Expand Down
6 changes: 3 additions & 3 deletions ...re/schema/syntaxHighlightingProvider.exsd → ...ui/schema/syntaxHighlightingProvider.exsd
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'?>
<!-- Schema file written by PDE -->
<schema targetNamespace="org.sonarlint.eclipse.core" xmlns="http://www.w3.org/2001/XMLSchema">
<schema targetNamespace="org.sonarlint.eclipse.ui" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.sonarlint.eclipse.core" id="syntaxHighlightingProvider" name="SonarLint Syntax Highlighting Provider"/>
<meta.schema plugin="org.sonarlint.eclipse.ui" id="syntaxHighlightingProvider" name="SonarLint Syntax Highlighting Provider"/>
</appInfo>
<documentation>
Help rule descriptions to find the correct syntax highlighting configuration for code snippets based on the external plugin implementation
Expand Down Expand Up @@ -55,7 +55,7 @@

</documentation>
<appInfo>
<meta.attribute kind="java" basedOn=":org.sonarlint.eclipse.core.internal.rule.ISyntaxHighlightingProvider"/>
<meta.attribute kind="java" basedOn=":org.sonarlint.eclipse.ui.internal.rule.ISyntaxHighlightingProvider"/>
</appInfo>
</annotation>
</attribute>
Expand Down
8 changes: 7 additions & 1 deletion ...lipse.ui/src/org/sonarlint/eclipse/ui/internal/extension/SonarLintUiExtensionTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@
import java.util.List;
import org.sonarlint.eclipse.core.internal.extension.AbstractSonarLintExtensionTracker;
import org.sonarlint.eclipse.ui.quickfixes.IMarkerResolutionEnhancer;
import org.sonarlint.eclipse.ui.rule.ISyntaxHighlightingProvider;

public class SonarLintUiExtensionTracker extends AbstractSonarLintExtensionTracker {

private static SonarLintUiExtensionTracker singleInstance = null;

private final SonarLintEP<IMarkerResolutionEnhancer> markerResolutionEnhancerEp = new SonarLintEP<>("org.sonarlint.eclipse.ui.markerResolutionEnhancer"); //$NON-NLS-1$
private final SonarLintEP<ISyntaxHighlightingProvider> syntaxHighlightingProviderEP = new SonarLintEP<>(
"org.sonarlint.eclipse.ui.syntaxHighlightingProvider"); //$NON-NLS-1$

private final Collection<SonarLintEP<?>> allEps = List.of(markerResolutionEnhancerEp);
private final Collection<SonarLintEP<?>> allEps = List.of(markerResolutionEnhancerEp, syntaxHighlightingProviderEP);

private SonarLintUiExtensionTracker() {
init(allEps);
Expand All @@ -53,4 +56,7 @@ public Collection<IMarkerResolutionEnhancer> getMarkerResolutionEnhancers() {
return markerResolutionEnhancerEp.getInstances();
}

public Collection<ISyntaxHighlightingProvider> getSyntaxHighlightingProvider() {
return syntaxHighlightingProviderEP.getInstances();
}
}
4 changes: 2 additions & 2 deletions org.sonarlint.eclipse.ui/src/org/sonarlint/eclipse/ui/internal/util/HTMLUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.sonarlint.eclipse.core.internal.extension.SonarLintExtensionTracker;
import org.sonarlint.eclipse.core.internal.utils.StringUtils;
import org.sonarlint.eclipse.ui.internal.extension.SonarLintUiExtensionTracker;

/** Utility class used for parsing the HTML rule description into native elements */
public final class HTMLUtils {
Expand Down Expand Up @@ -90,7 +90,7 @@ private static void createSourceViewer(String html, Composite parent, String lan
// is provided by any plug-in via the extension mechanism.
// INFO: Configuration must extend of org.eclipse.jface.text.source.SourceViewerConfiguration
// INFO: Document partitioner must implement org.eclipse.jface.text.IDocumentPartitioner
var configurationProviders = SonarLintExtensionTracker.getInstance().getSyntaxHighlightingProvider();
var configurationProviders = SonarLintUiExtensionTracker.getInstance().getSyntaxHighlightingProvider();
SourceViewerConfiguration sourceViewerConfigurationNullable = null;
for (var configurationProvider : configurationProviders) {
var sourceViewerConfigurationOptional = configurationProvider.sourceViewerConfiguration(languageKey);
Expand Down
Loading