Merge remote-tracking branch 'origin/master'

diff --git a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
index 60510164b2a18317341664b9e1e52408eded40e9..d70cff665beeae2bfad85ef6925cadc5b6fb4ddb 100644 (file)
--- a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.application.ex.ApplicationInfoEx;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.reference.SoftReference;
 import com.intellij.util.PlatformUtils;
 import org.jetbrains.annotations.NonNls;
@@ -69,12 +70,14 @@ public class HelpManagerImpl extends HelpManager {
         minorVersion = minorVersion.substring(0, dot);
       }
       String productVersion = info.getMajorVersion() + "." + minorVersion;
-      String productCode = info.getPackageCode();
 
       String url = info.getWebHelpUrl() + "/" + productVersion + "/?" + id;
       
       if (PlatformUtils.isJetBrainsProduct()) {
-        url += "&utm_source=from_product&utm_medium=help_link&utm_campaign=" + productCode + "&utm_content=" + productVersion;
+        String productCode = info.getBuild().getProductCode();
+        if(!StringUtil.isEmpty(productCode)) {
+          url += "&utm_source=from_product&utm_medium=help_link&utm_campaign=" + productCode + "&utm_content=" + productVersion;
+        }
       }
 
       BrowserUtil.browse(url);

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/MavenGroovyPomClassFinder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/MavenGroovyPomClassFinder.java
deleted file mode 100644 (file)
index 715133e..0000000
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/MavenGroovyPomClassFinder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.idea.maven.plugins.groovy;
-
-import com.intellij.ide.highlighter.JavaFileType;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.NonClasspathClassFinder;
-import org.jetbrains.plugins.groovy.GroovyFileType;
-
-import java.util.List;
-
-/**
- * @author Vladislav.Soroka
- * @since 8/29/2016
- */
-public class MavenGroovyPomClassFinder extends NonClasspathClassFinder {
-  public MavenGroovyPomClassFinder(Project project) {
-    super(project, JavaFileType.DEFAULT_EXTENSION, GroovyFileType.DEFAULT_EXTENSION);
-  }
-
-  @Override
-  protected List<VirtualFile> calcClassRoots() {
-    return MavenGroovyPomScriptType.additionalScopeFiles();
-  }
-}

diff --git a/plugins/maven/src/main/resources/META-INF/groovy-support.xml b/plugins/maven/src/main/resources/META-INF/groovy-support.xml
index 1b4e54bae53443336004ef2a069d9d45f993ae9c..363d2cf4fa224a09eeeab88b4a9392c25c10da3f 100644 (file)
--- a/plugins/maven/src/main/resources/META-INF/groovy-support.xml
+++ b/plugins/maven/src/main/resources/META-INF/groovy-support.xml
@@ -25,7 +25,6 @@
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
-    <java.elementFinder implementation="org.jetbrains.idea.maven.plugins.groovy.MavenGroovyPomClassFinder"/>
     <weigher key="completion" implementationClass="org.jetbrains.idea.maven.plugins.groovy.MavenGroovyPomCompletionWeigher"
              id="myWeigher" order="first"/>