Merge pull request #198 from ZenUml/upgrade-intellij

Upgrade intellij platform and fix deprecated APIs

Author: MrCoder

build.gradle

@@ -1,8 +1,8 @@
 plugins {
   id 'java'
   id 'idea'
-  id 'org.jetbrains.intellij' version '1.1.4'
-  id 'org.jetbrains.kotlin.jvm' version '1.4.21'
+  id 'org.jetbrains.intellij' version '1.4.0'
+  id 'org.jetbrains.kotlin.jvm' version '1.6.10'
   id "com.github.node-gradle.node" version "3.2.1"
 }
 buildSearchableOptions.enabled = false
@@ -15,12 +15,12 @@ dependencies {
   // https://mvnrepository.com/artifact/com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer
   compile group: 'com.googlecode.owasp-java-html-sanitizer', name: 'owasp-java-html-sanitizer'
 //  compile "org.jetbrains:markdown:${markdownParserVersion}"
-  compile 'org.jetbrains.kotlin:kotlin-reflect:1.5.31'
-  compile 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
+  compile 'org.jetbrains.kotlin:kotlin-reflect:1.6.10'
+  compile 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10'
   compile 'io.reactivex.rxjava2:rxjava:2.2.21'
 
   testCompile group: 'junit', name: 'junit', version: '4.12'
-  testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31'
+  testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10'
 }
 
 compileKotlin {
@@ -52,7 +52,8 @@ sourceSets {
 }
 
 intellij {
-  version = 'IC-2021.2.3'
+//  version = 'IC-2021.2.3'
+  version = 'IC-LATEST-EAP-SNAPSHOT'
   pluginName = 'zenuml'
   downloadSources = false
   updateSinceUntilBuild = false

src/com/intellij/ide/scratch/NewZenUmlBufferAction.java

@@ -1,8 +1,8 @@
 package com.intellij.ide.scratch;
 
 import com.intellij.lang.Language;
-import com.intellij.lang.StdLanguages;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.fileTypes.PlainTextLanguage;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.registry.Registry;
@@ -70,6 +70,6 @@ public void actionPerformed(@NotNull AnActionEvent e) {
 
     private Language getLanguage() {
         Language zenUML = Language.findLanguageByID("ZenUML");
-        return zenUML != null ? zenUML : StdLanguages.TEXT;
+        return zenUML != null ? zenUML : PlainTextLanguage.INSTANCE;
     }
 }

src/org/intellij/plugins/markdown/injection/LanguageGuesser.java

@@ -1,6 +1,7 @@
 package org.intellij.plugins.markdown.settings;
 
-import com.intellij.ide.ui.LafManager;
+import com.intellij.ide.ui.LafManagerListener;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
@@ -23,13 +24,15 @@
 )
 public class ZenUmlApplicationSettings implements PersistentStateComponent<ZenUmlApplicationSettings.State>,
                                                     MarkdownCssSettings.Holder,
-                                                    MarkdownPreviewSettings.Holder {
+                                                    MarkdownPreviewSettings.Holder, Disposable {
 
   private final State myState = new State();
 
   public ZenUmlApplicationSettings() {
     final MarkdownLAFListener lafListener = new MarkdownLAFListener();
-    LafManager.getInstance().addLafManagerListener(lafListener);
+    ApplicationManager
+            .getApplication().getMessageBus().connect(this)
+            .subscribe(LafManagerListener.TOPIC, lafListener);
     // Let's init proper CSS scheme
     ApplicationManager.getApplication().invokeLater(() -> lafListener.updateCssSettingsForced(UIUtil.isUnderDarcula()));
   }
@@ -90,6 +93,10 @@ public boolean isDisableInjections() {
     return myState.myDisableInjections;
   }
 
+  @Override
+  public void dispose() {
+  }
+
 
   public static class State {
     @Property(surroundWithTag = false)

src/org/intellij/plugins/markdown/settings/ZenUmlApplicationSettings.java

@@ -45,10 +45,7 @@ public class MarkdownPreviewFileEditor extends UserDataHolderBase implements Fil
 
   private final static long RENDERING_DELAY_MS = 20L;
 
-  final static NotNullLazyValue<PolicyFactory> SANITIZER_VALUE = new NotNullLazyValue<PolicyFactory>() {
-    @NotNull
-    @Override
-    protected PolicyFactory compute() {
+  final static NotNullLazyValue<PolicyFactory> SANITIZER_VALUE = NotNullLazyValue.lazy(() -> {
       return Sanitizers.BLOCKS
         .and(Sanitizers.FORMATTING)
         .and(new HtmlPolicyBuilder()
@@ -74,8 +71,8 @@ protected PolicyFactory compute() {
                .allowAttributes(HtmlGenerator.Companion.getSRC_ATTRIBUTE_NAME()).globally()
                .allowAttributes("class").onElements("code", "tr", "span")
                .toFactory());
-    }
-  };
+    });
+
   @NotNull
   private final JPanel myHtmlPanelWrapper;
   @Nullable

src/org/intellij/plugins/markdown/ui/preview/MarkdownPreviewFileEditor.java

@@ -1,6 +1,6 @@
 package org.intellij.plugins.markdown.ui.preview;
 
-import com.intellij.ide.scratch.ScratchFileType;
+import com.intellij.ide.scratch.ScratchUtil;
 import com.intellij.lang.LanguageUtil;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorPolicy;
@@ -18,7 +18,7 @@ public boolean accept(@NotNull Project project, @NotNull VirtualFile file) {
     final FileType fileType = file.getFileType();
 
     return (fileType == ZenUmlFileType.INSTANCE ||
-            fileType == ScratchFileType.INSTANCE && LanguageUtil.getLanguageForPsi(project, file) == ZenUmlLanguage.INSTANCE) &&
+            ScratchUtil.isScratch(file) && LanguageUtil.getLanguageForPsi(project, file) == ZenUmlLanguage.INSTANCE) &&
            MarkdownHtmlPanelProvider.hasAvailableProviders();
   }
 

src/org/intellij/plugins/markdown/ui/preview/MarkdownPreviewFileEditorProvider.java

@@ -69,7 +69,7 @@ public void navigateTo(@NotNull Navigatable navigatable) {
   @Override
   @NotNull
   public VirtualFile getFile() {
-    return FILE_KEY.get(this);
+    return getMainEditor().getFile();
   }
 
   public boolean isAutoScrollPreview() {

src/org/intellij/plugins/markdown/ui/preview/MarkdownSplitEditor.java

@@ -6,6 +6,7 @@
 import com.zenuml.sequence.plugins.jetbrains.html.ZenUmlHtmlGenerator;
 import org.apache.commons.io.FileUtils;
 import org.intellij.plugins.markdown.html.AddProtocolAndHost;
+import org.intellij.plugins.markdown.settings.ZenUmlApplicationSettings;
 import org.intellij.plugins.markdown.ui.preview.MarkdownHtmlPanel;
 import org.intellij.plugins.markdown.ui.preview.PreviewStaticServer2;
 import org.jetbrains.annotations.NotNull;
@@ -24,15 +25,19 @@ public class MarkdownJavaFxHtmlPanel extends JCEFHtmlPanel implements MarkdownHt
 
   public MarkdownJavaFxHtmlPanel() {
     super(null);
-    InputStream inputStream = this.getClass().getResourceAsStream("/html/zenuml/index.html");
+
+    String resource = "/html/zenuml/index.html";
+    InputStream inputStream = this.getClass().getResourceAsStream(resource);
+    if (inputStream == null) {
+      throw new IllegalStateException(String.format("Resource %s not found", resource));
+    }
+
     setHtml(readFromInputStream(inputStream));
   }
 
-  private String readFromInputStream(InputStream inputStream)
-           {
+  private String readFromInputStream(InputStream inputStream) {
     StringBuilder resultStringBuilder = new StringBuilder();
-    try (BufferedReader br
-                 = new BufferedReader(new InputStreamReader(inputStream))) {
+    try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) {
       String line;
       while ((line = br.readLine()) != null) {
         resultStringBuilder.append(line).append("\n");

src/org/intellij/plugins/markdown/ui/preview/javafx/JavaFXInstallator.java

@@ -62,12 +62,15 @@ public SequencePlugin2(Project project) {
 
     public void projectOpened() {
         createTabPane();
-        _toolWindow = getToolWindowManager().registerToolWindow(
-              PLAGIN_NAME, false, ToolWindowAnchor.BOTTOM);
-        final Content content = ServiceManager.getService(ContentFactory.class).createContent(_jTabbedPane, "", false);
-        _toolWindow.getContentManager().addContent(content);
-        _toolWindow.setIcon(SequencePluginIcons.SEQUENCE_ICON_13);
-        _toolWindow.setAvailable(false, null);
+        getToolWindowManager().invokeLater(() -> {
+            _toolWindow = getToolWindowManager().registerToolWindow(
+                    PLAGIN_NAME, false, ToolWindowAnchor.BOTTOM);
+
+            final Content content = ServiceManager.getService(ContentFactory.class).createContent(_jTabbedPane, "", false);
+            _toolWindow.getContentManager().addContent(content);
+            _toolWindow.setIcon(SequencePluginIcons.SEQUENCE_ICON_13);
+            _toolWindow.setAvailable(false, null);
+        });
     }
 
     private ToolWindowManager getToolWindowManager() {
@@ -136,14 +139,15 @@ private String generateZenUML(PsiMethod psiMethod) {
     private void createZenUMLScratch(String dsl, AnActionEvent event) {
         NewZenUmlBufferAction newBufferAction = new NewZenUmlBufferAction();
 
-        HashMap<String, Object> map = new HashMap<>();
-        map.put(CommonDataKeys.PROJECT.getName(), event.getData(CommonDataKeys.PROJECT));
-        map.put(LangDataKeys.IDE_VIEW.getName(), event.getData(LangDataKeys.IDE_VIEW));
-        map.put(PlatformDataKeys.PREDEFINED_TEXT.getName(), dsl);
+        DataContext context = SimpleDataContext.builder()
+                .add(CommonDataKeys.PROJECT, event.getData(CommonDataKeys.PROJECT))
+                .add(LangDataKeys.IDE_VIEW, event.getData(LangDataKeys.IDE_VIEW))
+                .add(PlatformDataKeys.PREDEFINED_TEXT, dsl)
+                .build();
         AnActionEvent anActionEvent = AnActionEvent.createFromAnAction(newBufferAction,
                 null,
                 event.getPlace(),
-                SimpleDataContext.getSimpleContext(map, null));
+                context);
         newBufferAction.actionPerformed(anActionEvent);
     }