From 5506bfc10d6758d8134fa57c10625833da179590 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Sun, 23 Oct 2016 15:46:54 +0300 Subject: [PATCH] PY-20801 Add missing "Intention" suffix to the name the class --- .../after.py.template | 0 .../before.py.template | 0 .../description.html | 0 python/src/META-INF/python-core-common.xml | 2 +- ...vertTypeCommentToVariableAnnotationIntention.java} | 11 +++++------ 5 files changed, 6 insertions(+), 7 deletions(-) rename python/resources/intentionDescriptions/{PyConvertTypeCommentToVariableAnnotation => PyConvertTypeCommentToVariableAnnotationIntention}/after.py.template (100%) rename python/resources/intentionDescriptions/{PyConvertTypeCommentToVariableAnnotation => PyConvertTypeCommentToVariableAnnotationIntention}/before.py.template (100%) rename python/resources/intentionDescriptions/{PyConvertTypeCommentToVariableAnnotation => PyConvertTypeCommentToVariableAnnotationIntention}/description.html (100%) rename python/src/com/jetbrains/python/codeInsight/intentions/{PyConvertTypeCommentToVariableAnnotation.java => PyConvertTypeCommentToVariableAnnotationIntention.java} (97%) diff --git a/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/after.py.template b/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/after.py.template similarity index 100% rename from python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/after.py.template rename to python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/after.py.template diff --git a/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/before.py.template b/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/before.py.template similarity index 100% rename from python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/before.py.template rename to python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/before.py.template diff --git a/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/description.html b/python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/description.html similarity index 100% rename from python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotation/description.html rename to python/resources/intentionDescriptions/PyConvertTypeCommentToVariableAnnotationIntention/description.html diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml index a2b5c41eb4f0..18e470efbdc5 100644 --- a/python/src/META-INF/python-core-common.xml +++ b/python/src/META-INF/python-core-common.xml @@ -312,7 +312,7 @@ - com.jetbrains.python.codeInsight.intentions.PyConvertTypeCommentToVariableAnnotation + com.jetbrains.python.codeInsight.intentions.PyConvertTypeCommentToVariableAnnotationIntention Python diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotation.java b/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java similarity index 97% rename from python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotation.java rename to python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java index 9bb6485bc425..785c7bb0445d 100644 --- a/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotation.java +++ b/python/src/com/jetbrains/python/codeInsight/intentions/PyConvertTypeCommentToVariableAnnotationIntention.java @@ -16,7 +16,6 @@ package com.jetbrains.python.codeInsight.intentions; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -37,12 +36,12 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; -import static com.jetbrains.python.psi.PyUtil.as; -import static com.jetbrains.python.psi.PyUtil.rehighlightOpenEditors; - -public class PyConvertTypeCommentToVariableAnnotation extends PyBaseIntentionAction { +public class PyConvertTypeCommentToVariableAnnotationIntention extends PyBaseIntentionAction { @Override public void doInvoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { final PsiComment typeComment = findCommentUnderCaret(editor, file);