WI-5680 Register 'Introduce Variable' refactoring in usage statistic

+ some more in usage statistic
+ some common constants
This commit is contained in:
Maxim.Mossienko
2011-03-29 15:48:21 +04:00
parent d30b192865
commit bc3f4bb758
5 changed files with 34 additions and 8 deletions
@@ -22,11 +22,10 @@ import com.intellij.codeInsight.generation.PsiMethodMember;
import com.intellij.codeInsight.intention.impl.ImplementAbstractMethodHandler;
import com.intellij.codeInspection.IntentionAndQuickFixAction;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.featureStatistics.ProductivityFeatureNames;
import com.intellij.ide.util.MemberChooser;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -36,7 +35,6 @@ import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.TreeMap;
@@ -64,7 +62,7 @@ public class ImplementMethodsFix extends IntentionAndQuickFixAction {
public void applyFix(final Project project, final PsiFile file, @Nullable final Editor editor) {
if (editor == null || !CodeInsightUtilBase.prepareFileForWrite(myPsiElement.getContainingFile())) return;
if (myPsiElement instanceof PsiEnumConstant) {
FeatureUsageTracker.getInstance().triggerFeatureUsed("codeassists.overrideimplement");
FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.CODEASSISTS_OVERRIDE_IMPLEMENT);
final TreeMap<MethodSignature, CandidateInfo> result =
new TreeMap<MethodSignature, CandidateInfo>(new OverrideImplementUtil.MethodSignatureComparator());
final HashMap<MethodSignature, PsiMethod> abstracts = new HashMap<MethodSignature, PsiMethod>();
@@ -21,6 +21,7 @@ import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.MethodImplementor;
import com.intellij.codeInsight.intention.AddAnnotationFix;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.featureStatistics.ProductivityFeatureNames;
import com.intellij.ide.fileTemplates.FileTemplate;
import com.intellij.ide.fileTemplates.FileTemplateManager;
import com.intellij.ide.fileTemplates.FileTemplateUtil;
@@ -455,12 +456,12 @@ public class OverrideImplementUtil {
}
public static void chooseAndOverrideMethods(Project project, Editor editor, PsiClass aClass){
FeatureUsageTracker.getInstance().triggerFeatureUsed("codeassists.overrideimplement");
FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.CODEASSISTS_OVERRIDE_IMPLEMENT);
chooseAndOverrideOrImplementMethods(project, editor, aClass, false);
}
public static void chooseAndImplementMethods(Project project, Editor editor, PsiClass aClass){
FeatureUsageTracker.getInstance().triggerFeatureUsed("codeassists.overrideimplement");
FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.CODEASSISTS_OVERRIDE_IMPLEMENT);
chooseAndOverrideOrImplementMethods(project, editor, aClass, true);
}
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.highlighting;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.featureStatistics.ProductivityFeatureNames;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -48,7 +49,7 @@ public class HighlightExitPointsHandler extends HighlightUsagesHandlerBase<PsiEl
}
public void computeUsages(final List<PsiElement> targets) {
FeatureUsageTracker.getInstance().triggerFeatureUsed("codeassists.highlight.return");
FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.CODEASSISTS_HIGHLIGHT_RETURN);
PsiElement parent = myTarget.getParent();
if (!(parent instanceof PsiReturnStatement) && !(parent instanceof PsiThrowStatement)) return;
@@ -21,6 +21,7 @@ import com.intellij.codeInsight.highlighting.HighlightManager;
import com.intellij.codeInsight.intention.impl.TypeExpression;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.featureStatistics.ProductivityFeatureNames;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.lang.LanguageRefactoringSupport;
import com.intellij.lang.refactoring.RefactoringSupportProvider;
@@ -187,7 +188,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
}
private boolean invoke(final Project project, final Editor editor, PsiFile file, int startOffset, int endOffset) {
FeatureUsageTracker.getInstance().triggerFeatureUsed("refactoring.introduceVariable");
FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.REFACTORING_INTRODUCE_VARIABLE);
PsiDocumentManager.getInstance(project).commitAllDocuments();