diff --git a/plugins/IntelliLang/src/META-INF/plugin.xml b/plugins/IntelliLang/src/META-INF/plugin.xml index a03cb883b532..086bf2d42211 100644 --- a/plugins/IntelliLang/src/META-INF/plugin.xml +++ b/plugins/IntelliLang/src/META-INF/plugin.xml @@ -20,20 +20,20 @@ org.intellij.plugins.intelliLang.inject.InjectLanguageAction - Language Injections + Language Injection org.intellij.plugins.intelliLang.inject.UnInjectLanguageAction - + Language Injection org.intellij.plugins.intelliLang.inject.EditInjectionSettingsAction - + Language Injection org.intellij.plugins.intelliLang.inject.quickedit.QuickEditAction - + Language Injection diff --git a/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/after.java.template b/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/after.java.template new file mode 100644 index 000000000000..391250caa0ad --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/after.java.template @@ -0,0 +1 @@ +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/before.java.template b/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/before.java.template new file mode 100644 index 000000000000..391250caa0ad --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/before.java.template @@ -0,0 +1 @@ +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/description.html b/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/description.html new file mode 100644 index 000000000000..20ae1483ef3c --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/EditInjectionSettingsAction/description.html @@ -0,0 +1,5 @@ + + +Opens language injection settings if available. + + \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/after.java.template b/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/after.java.template index caf04b69bf78..391250caa0ad 100644 --- a/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/after.java.template +++ b/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/after.java.template @@ -1,7 +1 @@ -class XmlConstants { - String ROOT_TAG = ""; - - void foo(){ - "".replaceAll("[^a-b]", ""); - } -} +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/before.java.template b/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/before.java.template index 2744467fdd71..391250caa0ad 100644 --- a/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/before.java.template +++ b/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/before.java.template @@ -1,3 +1 @@ -class XmlConstants { - String ROOT_TAG = ""; -} +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/description.html b/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/description.html index e69de29bb2d1..44a47d111940 100644 --- a/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/description.html +++ b/plugins/IntelliLang/src/intentionDescriptions/InjectLanguageAction/description.html @@ -0,0 +1,5 @@ + + +Injects language into text-holding program element (string literal, XML attribute and tag body, etc.). + + \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/after.java.template b/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/after.java.template new file mode 100644 index 000000000000..391250caa0ad --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/after.java.template @@ -0,0 +1 @@ +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/before.java.template b/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/before.java.template new file mode 100644 index 000000000000..391250caa0ad --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/before.java.template @@ -0,0 +1 @@ +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/description.html b/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/description.html new file mode 100644 index 000000000000..0fd0a0873b88 --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/QuickEditAction/description.html @@ -0,0 +1,5 @@ + + +Edit injected fragment in a designated editor without outer language escaping and concatenations. + + \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/after.java.template b/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/after.java.template new file mode 100644 index 000000000000..391250caa0ad --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/after.java.template @@ -0,0 +1 @@ +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/before.java.template b/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/before.java.template new file mode 100644 index 000000000000..391250caa0ad --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/before.java.template @@ -0,0 +1 @@ +XXX \ No newline at end of file diff --git a/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/description.html b/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/description.html new file mode 100644 index 000000000000..b1f57e463b65 --- /dev/null +++ b/plugins/IntelliLang/src/intentionDescriptions/UnInjectLanguageAction/description.html @@ -0,0 +1,5 @@ + + +Removes language injection if it is configurable. + + \ No newline at end of file diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/EditInjectionSettingsAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/EditInjectionSettingsAction.java index f2d400ad9bae..2c8426d2c4b2 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/EditInjectionSettingsAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/EditInjectionSettingsAction.java @@ -53,7 +53,7 @@ public class EditInjectionSettingsAction implements IntentionAction { @NotNull public String getFamilyName() { - return InjectLanguageAction.INJECT_LANGUAGE_FAMILY; + return "Edit Injection Settings"; } public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java index 63f609448bc8..36b012b60073 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java @@ -51,7 +51,7 @@ import java.util.Collections; import java.util.List; public class InjectLanguageAction implements IntentionAction { - @NonNls protected static final String INJECT_LANGUAGE_FAMILY = "Inject Language"; + @NonNls private static final String INJECT_LANGUAGE_FAMILY = "Inject Language"; @NotNull public String getText() { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java index 4847d2c0fe73..80555e8de3c6 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/UnInjectLanguageAction.java @@ -50,7 +50,7 @@ public class UnInjectLanguageAction implements IntentionAction { @NotNull public String getFamilyName() { - return InjectLanguageAction.INJECT_LANGUAGE_FAMILY; + return getText(); } public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java index c94135fc6765..d5043ac80a32 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java @@ -89,7 +89,7 @@ public class QuickEditAction implements IntentionAction { @NotNull public String getFamilyName() { - return "Quick Edit"; + return "Edit Injected Fragment"; } public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {