MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Move JPS build issue contributor EP to compile-impl module

Browse Source 
GitOrigin-RevId: a2ec222e66183c0bb79e54f8726caee73e950b3e
This commit is contained in:
Vladislav.Soroka
2020-11-23 15:24:09 +03:00
committed by intellij-monorepo-bot
parent 97dc240ec5
commit ea5b5de628
6 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/lang-impl/src/com/intellij/build/progress/BuildIssueContributor.java → java/compiler/impl/src/com/intellij/compiler/progress/BuildIssueContributor.java
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.build.progress;
package com.intellij.compiler.progress;
import com.intellij.build.events.MessageEvent;
import com.intellij.build.issue.BuildIssue;

19
java/compiler/impl/src/com/intellij/compiler/progress/BuildOutputService.java
View File

@@ -4,7 +4,6 @@ package com.intellij.compiler.progress;
import com.intellij.build.*;
import com.intellij.build.events.MessageEvent;
import com.intellij.build.issue.BuildIssue;
import com.intellij.build.progress.BuildIssueContributor;
import com.intellij.build.progress.BuildProgress;
import com.intellij.build.progress.BuildProgressDescriptor;
import com.intellij.compiler.impl.CompilerPropertiesAction;
@@ -18,7 +17,6 @@ import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.compiler.CompilerMessage;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.compiler.JavaCompilerBundle;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.progress.ProgressIndicator;
@@ -42,9 +40,8 @@ import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
@ApiStatus.Internal
public class BuildOutputService implements BuildViewService {
private static final Logger LOG = Logger.getInstance(BuildViewService.class);
private static final ExtensionPointName<BuildIssueContributor> BUILD_ISSUE_EP =
ExtensionPointName.create("com.intellij.build.issueContributor");
ExtensionPointName.create("com.intellij.compiler.buildIssueContributor");
private static final @NonNls String ANSI_RESET = "\u001B[0m";
private static final @NonNls String ANSI_RED = "\u001B[31m";
@@ -189,17 +186,9 @@ public class BuildOutputService implements BuildViewService {
@NotNull MessageEvent.Kind kind,
@Nullable VirtualFile virtualFile,
@Nullable Navigatable navigatable) {
try {
for (BuildIssueContributor ex : BUILD_ISSUE_EP.getExtensionList()) {
BuildIssue issue = ex.createBuildIssue(myProject, moduleNames, title, message, kind, virtualFile, navigatable);
if (issue != null) return issue;
}
}
catch (Exception e) {
LOG.error(e);
}
return null;
return BUILD_ISSUE_EP.computeSafeIfAny(contributor -> {
return contributor.createBuildIssue(myProject, moduleNames, title, message, kind, virtualFile, navigatable);
});
}
@NotNull

1
java/java-impl/src/META-INF/JavaPlugin.xml
View File

@@ -169,6 +169,7 @@
<extensionPoint qualifiedName="com.intellij.compileServer.plugin" beanClass="com.intellij.compiler.server.CompileServerPlugin" dynamic="true"/>
<extensionPoint qualifiedName="com.intellij.buildProcess.parametersProvider" area="IDEA_PROJECT"
interface="com.intellij.compiler.server.BuildProcessParametersProvider" dynamic="true"/>
<extensionPoint qualifiedName="com.intellij.compiler.buildIssueContributor" dynamic="true" interface="com.intellij.compiler.progress.BuildIssueContributor"/>
<extensionPoint qualifiedName="com.intellij.attachSourcesProvider" interface="com.intellij.codeInsight.AttachSourcesProvider" dynamic="true"/>

1
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
View File

@@ -583,7 +583,6 @@
<extensionPoint name="lang.directNavigationProvider" dynamic="true" interface="com.intellij.navigation.DirectNavigationProvider"/>
<extensionPoint name="readerModeProvider" dynamic="true" interface="com.intellij.codeInsight.actions.ReaderModeProvider"/>
<extensionPoint name="readerModeMatcher" dynamic="true" interface="com.intellij.codeInsight.actions.ReaderModeMatcher"/>
<extensionPoint name="build.issueContributor" dynamic="true" interface="com.intellij.build.progress.BuildIssueContributor"/>
</extensionPoints>
</idea-plugin>

2
plugins/maven/src/main/java/org/jetbrains/idea/maven/externalSystemIntegration/output/quickfixes/SourceOptionQuickFix.kt
View File

@@ -7,7 +7,7 @@ import com.intellij.build.events.MessageEvent
import com.intellij.build.events.impl.BuildIssueEventImpl
import com.intellij.build.issue.BuildIssue
import com.intellij.build.issue.BuildIssueQuickFix
import com.intellij.build.progress.BuildIssueContributor
import com.intellij.compiler.progress.BuildIssueContributor
import com.intellij.notification.Notification
import com.intellij.notification.NotificationType
import com.intellij.openapi.actionSystem.DataProvider

2
plugins/maven/src/main/resources/META-INF/plugin.xml
View File

@@ -282,7 +282,7 @@
<module.workingDirectoryProvider implementation="org.jetbrains.idea.maven.project.MavenWorkingDirectoryProvider"/>
<notificationGroup id="Maven" displayType="BALLOON"/>
<toolWindowAllowlist id="Maven"/>
<build.issueContributor implementation="org.jetbrains.idea.maven.externalSystemIntegration.output.quickfixes.JpsReleaseVersion5QuickFix" />
<compiler.buildIssueContributor implementation="org.jetbrains.idea.maven.externalSystemIntegration.output.quickfixes.JpsReleaseVersion5QuickFix" />
</extensions>
<extensions defaultExtensionNs="com.intellij.properties">