Merge branch 'endgame-july'

Author: Flanker32

CHANGELOG.md

@@ -70,6 +70,10 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.55.1
+### Added
+- Add support for IntelliJ 2021.2
+
 ## 3.55.0
 ### Added
 - New Azure Resource Connector explorer for connection management

PluginsAndFeatures/azure-toolkit-for-intellij/.idea/gradle.xml

@@ -79,7 +79,8 @@ public boolean execute(@NotNull DataContext dataContext, @NotNull RunConfigurati
     public static class MyRunConfigurationExtension extends RunConfigurationExtension {
 
         @Override
-        public <T extends RunConfigurationBase> void updateJavaParameters(@NotNull T configuration, @NotNull JavaParameters params, RunnerSettings settings) {
+        public <T extends RunConfigurationBase<?>> void updateJavaParameters(@NotNull T configuration, @NotNull JavaParameters params,
+                                                                             RunnerSettings settings) {
             final @NotNull List<?> beforeTasks = configuration.getBeforeRunTasks();
             beforeTasks.stream().filter(t -> t instanceof MyBeforeRunTask).map(t -> (MyBeforeRunTask) t)
                     .flatMap(t -> t.connections.stream())

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/ConnectionRunnerForRunConfiguration.java

@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
 package com.microsoft.azure.toolkit.intellij.azuresdk.referencebook;
 
 import com.google.common.collect.ImmutableMap;
@@ -49,11 +54,12 @@ private void initEventListeners() {
 
     private void setLinks(@Nonnull final Map<String, String> links) {
         this.links.removeAll();
-        links.forEach((type, url) -> {
-            final HyperlinkLabel link = new HyperlinkLabel();
+        linkNames.forEach((type, name) -> {
+            final String url = links.get(type);
             if (StringUtils.isNotBlank(url)) {
+                final HyperlinkLabel link = new HyperlinkLabel();
                 this.links.add(new JToolBar.Separator());
-                link.setHyperlinkText(linkNames.get(type));
+                link.setHyperlinkText(name);
                 link.setHyperlinkTarget(url);
                 this.links.add(new JSeparator(SwingConstants.VERTICAL));
                 this.links.add(link);
@@ -69,14 +75,14 @@ private DropDownLink<String> buildVersionSelector() {
         if (StringUtils.isNotBlank(artifact.getVersionPreview())) {
             versions.add(artifact.getVersionPreview());
         }
-        final DropDownLink<String> version = new DropDownLink<>(versions.get(0), versions, (String v) -> {
+        final DropDownLink<String> versionSelector = new DropDownLink<>(versions.get(0), versions, (String v) -> {
             if (this.artifactId.isSelected()) {
                 this.setLinks(this.artifact.getLinks(v));
                 this.onArtifactOrVersionSelected.accept(this.artifact, this.version.getSelectedItem());
             }
         }, true);
-        version.setForeground(JBColor.BLACK);
-        return version;
+        versionSelector.setForeground(JBColor.BLACK);
+        return versionSelector;
     }
 
     public void setSelected(boolean selected) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/referencebook/AzureSdkArtifactDetailPanel.java

@@ -1,6 +1,7 @@
 plugins {
     id "org.jetbrains.intellij" version "0.7.2"
-    id "org.jetbrains.kotlin.jvm" version "1.3.50"
+    id "org.jetbrains.kotlin.jvm" version "1.4.20"
+    id 'org.openjfx.javafxplugin' version '0.0.9'
     id "de.undercouch.download" version "4.1.1"
     id "com.github.ben-manes.versions" version "0.39.0"
     id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"
@@ -212,7 +213,7 @@ dependencies {
     compile group: 'jaxen', name: 'jaxen', version: '1.2.0'
     compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20")
 
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly 'org.projectlombok:lombok'

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -1,8 +1,8 @@
 javaVersion=11
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
-intellij_version=IC-2020.3
-dep_plugins=org.intellij.scala:2020.3.8
+intellij_version=IC-2021.1
+dep_plugins=org.intellij.scala:2021.1.15
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 updateVersionRange=true
-patchPluginXmlSinceBuild=203.5419.21
+patchPluginXmlSinceBuild=211.6693.14

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -2,7 +2,7 @@
              xmlns:xi="http://www.w3.org/2001/XInclude">
   <id>com.microsoft.tooling.msservices.intellij.azure</id>
   <name>Azure Toolkit for IntelliJ</name>
-  <version>3.55.0</version>
+  <version>3.55.1</version>
   <vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
 
   <description><![CDATA[
@@ -25,57 +25,10 @@
   <change-notes>
     <![CDATA[
     <html>
-        <h3>3.55.0</h3>
+        <h3>3.55.1</h3>
         <h4>Added</h4>
         <ul>
-            <li>New Azure Resource Connector explorer for connection management</li>
-            <ul>
-                <li>List all resource connections connected to project</li>
-                <li>Create new connections between Azure resources and module in project</li>
-                <li>Edit/Delete existing connections</li>
-                <li>Navigate to resource properties view of an existing connection</li>
-            </ul>
-            <li>Support native proxy settings in IntelliJ</li>
-            <li>
-                Add unified
-                <code>Open In Portal</code>
-                support for Web App/VM/Resource Group in Azure explorer
-            </li>
-        </ul>
-        <h4>Changed</h4>
-        <ul>
-            <li>Enhance toolkit setting panel with more configuration</li>
-            <li>Enhance resource loading performance in Azure explorer</li>
-            <li>Support turn off Azure SDK deprecation notification</li>
-            <li>Support create Azure Spring Cloud app in Azure explorer</li>
-            <li>Update Azure icons to new style</li>
-        </ul>
-        <h4>Fixed</h4>
-        <ul>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/issues/5439">#5439</a>
-                Fix project already disposed excpetion while loading azure sdk reference book meta data
-            </li>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/pull/5437">PR#5437</a>
-                Fix exception while edit json in service principal dialog
-            </li>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/pull/5476">PR#5476</a>
-                Fix url render issue for toolkit notification
-            </li>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/pull/5535">PR#5535</a>
-                Fix evaluate effective pom will break app service/spring cloud deployment
-            </li>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/pull/5563">PR#5563</a>
-                Fix exception: type HTTP is not compatible with address null
-            </li>
-            <li>
-                <a href="https://github.com/microsoft/azure-tools-for-java/pull/5579">PR#5579</a>
-                Fix reporting error in azure explorer before sign in
-            </li>
+            <li>Add support for IntelliJ 2021.2</li>
         </ul>
         <p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
     </html>

PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml

@@ -1,6 +1,10 @@
 <!-- Version: 3.55.0 -->
 # What's new in Azure Toolkit for IntelliJ
 
+## 3.55.1
+### Added
+- Add support for IntelliJ 2021.2
+
 ## 3.55.0
 ### Added
 - New Azure Resource Connector explorer for connection management

PluginsAndFeatures/azure-toolkit-for-intellij/resources/whatsnew/whatsnew.md

@@ -125,7 +125,7 @@ public String getDefaultExtension() {
             @Nullable
             @Override
             public Icon getIcon() {
-                return StreamUtil.getImageResourceFile(CommonConst.SPARK_JOBVIEW_ICONPATH);
+                return PluginUtil.getIcon(CommonConst.SPARK_JOBVIEW_ICONPATH);
             }
 
             @Override

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/common/HDInsightHelperImpl.java

@@ -143,4 +143,9 @@ public <T> T getUserData(@NotNull Key<T> key) {
     public <T> void putUserData(@NotNull Key<T> key, @Nullable T t) {
 
     }
+
+    @Override
+    public @org.jetbrains.annotations.Nullable VirtualFile getFile() {
+        return myVirtualFile;
+    }
 }