MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

move postfix templates to java-impl

Browse Source
This commit is contained in:
Sergey Ignatov
2013-12-19 12:35:46 +04:00
parent 8286229281
commit dce2c1739c
284 changed files with 284 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/java-impl.iml
View File

@@ -18,10 +18,6 @@
<sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/testSrc" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/resources" isTestSource="false" />
</content>
<content url="file://$MODULE_DIR$/../../plugins/postfix">
<sourceFolder url="file://$MODULE_DIR$/../../plugins/postfix/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../plugins/postfix/testSrc" isTestSource="true" />
</content>
<orderEntry type="module" module-name="boot" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

4
plugins/postfix/src/org/jetbrains/postfixCompletion/completion/PostfixTemplateCompletionContributor.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateCompletionContributor.java
View File

@@ -1,8 +1,9 @@
package org.jetbrains.postfixCompletion.completion;
package com.intellij.codeInsight.template.postfix.completion;
import com.intellij.codeInsight.completion.CompletionContributor;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.template.CustomLiveTemplate;
import com.intellij.codeInsight.template.postfix.templates.PostfixLiveTemplate;
import com.intellij.patterns.ElementPattern;
import com.intellij.psi.JavaTokenType;
import com.intellij.psi.PsiElement;
@@ -11,7 +12,6 @@ import com.intellij.psi.impl.source.tree.ElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.templates.PostfixLiveTemplate;
import static com.intellij.patterns.PsiJavaPatterns.psiElement;
import static com.intellij.patterns.StandardPatterns.string;

10
plugins/postfix/src/org/jetbrains/postfixCompletion/completion/PostfixTemplateLookupActionProvider.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupActionProvider.java
View File

@@ -1,19 +1,19 @@
package org.jetbrains.postfixCompletion.completion;
package com.intellij.codeInsight.template.postfix.completion;
import com.intellij.codeInsight.lookup.Lookup;
import com.intellij.codeInsight.lookup.LookupActionProvider;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementAction;
import com.intellij.codeInsight.template.postfix.settings.PostfixCompletionConfigurable;
import com.intellij.codeInsight.template.postfix.settings.PostfixCompletionSettings;
import com.intellij.codeInsight.template.postfix.settings.PostfixTemplatesListPanel;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.project.Project;
import com.intellij.util.Consumer;
import com.intellij.util.PlatformIcons;
import org.jetbrains.postfixCompletion.settings.PostfixCompletionConfigurable;
import org.jetbrains.postfixCompletion.settings.PostfixCompletionSettings;
import org.jetbrains.postfixCompletion.settings.PostfixTemplatesListPanel;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
public class PostfixTemplateLookupActionProvider implements LookupActionProvider {
@Override

8
plugins/postfix/src/org/jetbrains/postfixCompletion/completion/PostfixTemplateLookupElement.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupElement.java
View File

@@ -1,18 +1,18 @@
package org.jetbrains.postfixCompletion.completion;
package com.intellij.codeInsight.template.postfix.completion;
import com.intellij.codeInsight.completion.InsertionContext;
import com.intellij.codeInsight.lookup.LookupElementPresentation;
import com.intellij.codeInsight.template.CustomTemplateCallback;
import com.intellij.codeInsight.template.impl.LiveTemplateLookupElement;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.postfix.templates.PostfixLiveTemplate;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.templates.PostfixLiveTemplate;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
import static org.jetbrains.postfixCompletion.completion.PostfixTemplateCompletionContributor.getPostfixLiveTemplate;
import static com.intellij.codeInsight.template.postfix.completion.PostfixTemplateCompletionContributor.getPostfixLiveTemplate;
class PostfixTemplateLookupElement extends LiveTemplateLookupElement {
@NotNull

10
plugins/postfix/src/org/jetbrains/postfixCompletion/completion/PostfixTemplatesCompletionProvider.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplatesCompletionProvider.java
View File

@@ -1,19 +1,19 @@
package org.jetbrains.postfixCompletion.completion;
package com.intellij.codeInsight.template.postfix.completion;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionProvider;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.codeInsight.template.CustomTemplateCallback;
import com.intellij.codeInsight.template.postfix.settings.PostfixCompletionSettings;
import com.intellij.codeInsight.template.postfix.templates.PostfixLiveTemplate;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.patterns.StandardPatterns;
import com.intellij.psi.PsiFile;
import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.settings.PostfixCompletionSettings;
import org.jetbrains.postfixCompletion.templates.PostfixLiveTemplate;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
import static org.jetbrains.postfixCompletion.completion.PostfixTemplateCompletionContributor.getPostfixLiveTemplate;
import static com.intellij.codeInsight.template.postfix.completion.PostfixTemplateCompletionContributor.getPostfixLiveTemplate;
class PostfixTemplatesCompletionProvider extends CompletionProvider<CompletionParameters> {
@Override

2
plugins/postfix/src/org/jetbrains/postfixCompletion/settings/PostfixCompletionConfigurable.form → java/java-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixCompletionConfigurable.form
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.postfixCompletion.settings.PostfixCompletionConfigurable">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.codeInsight.template.postfix.settings.PostfixCompletionConfigurable">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>

4
plugins/postfix/src/org/jetbrains/postfixCompletion/settings/PostfixCompletionConfigurable.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixCompletionConfigurable.java
View File

@@ -1,8 +1,9 @@
package org.jetbrains.postfixCompletion.settings;
package com.intellij.codeInsight.template.postfix.settings;
import com.intellij.application.options.editor.EditorOptionsProvider;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SearchableConfigurable;
@@ -12,7 +13,6 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
import javax.swing.*;
import javax.swing.event.ChangeEvent;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/settings/PostfixCompletionSettings.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixCompletionSettings.java
View File

@@ -1,13 +1,13 @@
package org.jetbrains.postfixCompletion.settings;
package com.intellij.codeInsight.template.postfix.settings;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xmlb.XmlSerializerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
import java.io.File;
import java.util.Map;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/settings/PostfixTemplatesListPanel.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesListPanel.java
View File

@@ -1,5 +1,6 @@
package org.jetbrains.postfixCompletion.settings;
package com.intellij.codeInsight.template.postfix.settings;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.ui.BooleanTableCellEditor;
import com.intellij.ui.BooleanTableCellRenderer;
import com.intellij.ui.TableViewSpeedSearch;
@@ -14,7 +15,6 @@ import com.intellij.util.ui.ListTableModel;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
import javax.swing.*;
import javax.swing.table.TableCellEditor;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/AssertStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/AssertStatementPostfixTemplate.java
View File

@@ -1,9 +1,9 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.CommonUtils;
public class AssertStatementPostfixTemplate extends BooleanPostfixTemplate {
public AssertStatementPostfixTemplate() {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/BooleanPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/BooleanPostfixTemplate.java
View File

@@ -1,11 +1,11 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Document;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiExpressionStatement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.CommonUtils;
abstract public class BooleanPostfixTemplate extends PostfixTemplate {
protected BooleanPostfixTemplate(@NotNull String name, @NotNull String description, @NotNull String example) {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/CastExpressionPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/CastExpressionPostfixTemplate.java
View File

@@ -1,9 +1,9 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.JavaSurroundersProxy;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.JavaSurroundersProxy;
public class CastExpressionPostfixTemplate extends ExpressionPostfixTemplateWithChooser {
public CastExpressionPostfixTemplate() {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ElseStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ElseStatementPostfixTemplate.java
View File

@@ -1,12 +1,12 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.CodeInsightServicesUtil;
import com.intellij.codeInsight.template.postfix.util.JavaSurroundersProxy;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.JavaSurroundersProxy;
public class ElseStatementPostfixTemplate extends BooleanPostfixTemplate {
public ElseStatementPostfixTemplate() {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ExpressionPostfixTemplateWithChooser.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ExpressionPostfixTemplateWithChooser.java
View File

@@ -1,5 +1,6 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.codeInsight.unwrap.ScopeHighlighter;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
@@ -16,7 +17,6 @@ import com.intellij.refactoring.IntroduceTargetChooser;
import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.CommonUtils;
import java.util.List;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ForAscendingPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForAscendingPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiExpression;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ForDescendingPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForDescendingPostfixTemplate.java
View File

@@ -1,10 +1,10 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.util.CommonUtils;
public class ForDescendingPostfixTemplate extends ForIndexedPostfixTemplate {
public ForDescendingPostfixTemplate() {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ForIndexedPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForIndexedPostfixTemplate.java
View File

@@ -1,9 +1,10 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.Template;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.codeInsight.template.impl.MacroCallNode;
import com.intellij.codeInsight.template.macro.SuggestVariableNameMacro;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -14,7 +15,6 @@ import com.intellij.psi.PsiExpressionStatement;
import com.intellij.psi.PsiType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.util.CommonUtils;
public abstract class ForIndexedPostfixTemplate extends PostfixTemplate {
protected ForIndexedPostfixTemplate(@NotNull String key, @NotNull String description, @NotNull String example) {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ForeachPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ForeachPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.Template;
import com.intellij.codeInsight.template.TemplateManager;
@@ -7,6 +7,7 @@ import com.intellij.codeInsight.template.impl.TextExpression;
import com.intellij.codeInsight.template.impl.VariableNode;
import com.intellij.codeInsight.template.macro.IterableComponentTypeMacro;
import com.intellij.codeInsight.template.macro.SuggestVariableNameMacro;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -14,7 +15,6 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiExpressionStatement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.CommonUtils;
public class ForeachPostfixTemplate extends PostfixTemplate {
public ForeachPostfixTemplate() {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/IfStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/IfStatementPostfixTemplate.java
View File

@@ -1,11 +1,11 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.JavaSurroundersProxy;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.JavaSurroundersProxy;
public class IfStatementPostfixTemplate extends BooleanPostfixTemplate {
public IfStatementPostfixTemplate() {

6
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/InstanceofExpressionPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/InstanceofExpressionPostfixTemplate.java
View File

@@ -1,9 +1,11 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.guess.GuessManager;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.PsiTypeLookupItem;
import com.intellij.codeInsight.template.*;
import com.intellij.codeInsight.template.postfix.util.Aliases;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
@@ -14,8 +16,6 @@ import com.intellij.psi.*;
import com.intellij.refactoring.introduceField.ElementToWorkOn;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.Aliases;
import org.jetbrains.postfixCompletion.util.CommonUtils;
import java.util.LinkedHashSet;
import java.util.Set;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/IntroduceFieldPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/IntroduceFieldPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Editor;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/IntroduceVariablePostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/IntroduceVariablePostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Editor;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/IsNullCheckPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/IsNullCheckPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import org.jetbrains.annotations.NotNull;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/NewExpressionPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/NewExpressionPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/NotExpressionPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/NotExpressionPostfixTemplate.java
View File

@@ -1,11 +1,11 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.CodeInsightServicesUtil;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.PsiExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.CommonUtils;
public class NotExpressionPostfixTemplate extends ExpressionPostfixTemplateWithChooser {
public NotExpressionPostfixTemplate() {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/NotNullCheckPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/NotNullCheckPostfixTemplate.java
View File

@@ -1,7 +1,7 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.Aliases;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.Aliases;
@Aliases("nn")
public class NotNullCheckPostfixTemplate extends NullCheckPostfixTemplate {

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/NullCheckPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/NullCheckPostfixTemplate.java
View File

@@ -1,12 +1,12 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.JavaSurroundersProxy;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.JavaSurroundersProxy;
/**
* @author ignatov

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ParenthesizedExpressionPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ParenthesizedExpressionPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.JavaPsiFacade;

6
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/PostfixLiveTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixLiveTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.completion.CompletionInitializationContext;
import com.intellij.codeInsight.completion.CompletionType;
@@ -6,6 +6,8 @@ import com.intellij.codeInsight.completion.JavaCompletionContributor;
import com.intellij.codeInsight.template.CustomLiveTemplateBase;
import com.intellij.codeInsight.template.CustomTemplateCallback;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.postfix.settings.PostfixCompletionSettings;
import com.intellij.codeInsight.template.postfix.util.Aliases;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
@@ -25,8 +27,6 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.settings.PostfixCompletionSettings;
import org.jetbrains.postfixCompletion.util.Aliases;
import java.util.HashMap;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/PostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixTemplate.java
View File

@@ -1,5 +1,6 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.settings.PostfixCompletionSettings;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.extensions.ExtensionPointName;
@@ -8,7 +9,6 @@ import com.intellij.psi.PsiExpression;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.settings.PostfixCompletionSettings;
public abstract class PostfixTemplate {
@NotNull private final String myPresentableName;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ReturnStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ReturnStatementPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/StatementPostfixTemplateBase.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/StatementPostfixTemplateBase.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.CodeInsightUtilCore;
import com.intellij.openapi.editor.Editor;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/SwitchStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/SwitchStatementPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/SynchronizedStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/SynchronizedStatementPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/ThrowExceptionPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ThrowExceptionPostfixTemplate.java
View File

@@ -1,12 +1,12 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.codeInsight.template.postfix.util.CommonUtils;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiExpressionStatement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.postfixCompletion.util.CommonUtils;
public class ThrowExceptionPostfixTemplate extends PostfixTemplate {
public ThrowExceptionPostfixTemplate() {

2
plugins/postfix/src/org/jetbrains/postfixCompletion/templates/WhileStatementPostfixTemplate.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/WhileStatementPostfixTemplate.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.templates;
package com.intellij.codeInsight.template.postfix.templates;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.*;

2
plugins/postfix/src/org/jetbrains/postfixCompletion/util/Aliases.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/util/Aliases.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.util;
package com.intellij.codeInsight.template.postfix.util;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

4
plugins/postfix/src/org/jetbrains/postfixCompletion/util/CommonUtils.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/util/CommonUtils.java
View File

@@ -1,5 +1,6 @@
package org.jetbrains.postfixCompletion.util;
package com.intellij.codeInsight.template.postfix.util;
import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
@@ -8,7 +9,6 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.postfixCompletion.templates.PostfixTemplate;
public abstract class CommonUtils {
private CommonUtils() {

2
plugins/postfix/src/org/jetbrains/postfixCompletion/util/JavaSurroundersProxy.java → java/java-impl/src/com/intellij/codeInsight/template/postfix/util/JavaSurroundersProxy.java
View File

@@ -1,4 +1,4 @@
package org.jetbrains.postfixCompletion.util;
package com.intellij.codeInsight.template.postfix.util;
import com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurroundDescriptor;
import com.intellij.lang.surroundWith.Surrounder;

0
plugins/postfix/testData/backlog/var/var03-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var03-out.java
View File

0
plugins/postfix/testData/backlog/var/var03.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var03.java
View File

0
plugins/postfix/testData/backlog/var/var04-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var04-out.java
View File

0
plugins/postfix/testData/backlog/var/var04.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var04.java
View File

0
plugins/postfix/testData/backlog/var/var05-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var05-out.java
View File

0
plugins/postfix/testData/backlog/var/var05.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var05.java
View File

0
plugins/postfix/testData/backlog/var/var06-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var06-out.java
View File

0
plugins/postfix/testData/backlog/var/var06.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var06.java
View File

0
plugins/postfix/testData/backlog/var/var07-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var07-out.java
View File

0
plugins/postfix/testData/backlog/var/var07.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var07.java
View File

0
plugins/postfix/testData/backlog/var/var08-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var08-out.java
View File

0
plugins/postfix/testData/backlog/var/var08.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var08.java
View File

0
plugins/postfix/testData/backlog/var/var09-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var09-out.java
View File

0
plugins/postfix/testData/backlog/var/var09.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var09.java
View File

0
plugins/postfix/testData/backlog/var/var10-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var10-out.java
View File

0
plugins/postfix/testData/backlog/var/var10.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var10.java
View File

0
plugins/postfix/testData/backlog/var/var11-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var11-out.java
View File

0
plugins/postfix/testData/backlog/var/var11.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var11.java
View File

0
plugins/postfix/testData/backlog/var/var12-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var12-out.java
View File

0
plugins/postfix/testData/backlog/var/var12.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var12.java
View File

0
plugins/postfix/testData/backlog/var/var13-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var13-out.java
View File

0
plugins/postfix/testData/backlog/var/var13.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var13.java
View File

0
plugins/postfix/testData/backlog/var/var14-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var14-out.java
View File

0
plugins/postfix/testData/backlog/var/var14.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var14.java
View File

0
plugins/postfix/testData/backlog/var/var15-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var15-out.java
View File

0
plugins/postfix/testData/backlog/var/var15.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var15.java
View File

0
plugins/postfix/testData/backlog/var/var16-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var16-out.java
View File

0
plugins/postfix/testData/backlog/var/var16.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var16.java
View File

0
plugins/postfix/testData/backlog/var/var17-out.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var17-out.java
View File

0
plugins/postfix/testData/backlog/var/var17.java → java/java-tests/testData/codeInsight/template/postfix/backlog/var/var17.java
View File

0
plugins/postfix/testData/completion/doNotShowDisabledTemplate.java → java/java-tests/testData/codeInsight/template/postfix/completion/doNotShowDisabledTemplate.java
View File

0
plugins/postfix/testData/completion/doNotShowTemplateIfPluginIsDisabled.java → java/java-tests/testData/codeInsight/template/postfix/completion/doNotShowTemplateIfPluginIsDisabled.java
View File

0
plugins/postfix/testData/completion/doNotShowTemplateIfTemplateCompletionIsDisabled.java → java/java-tests/testData/codeInsight/template/postfix/completion/doNotShowTemplateIfTemplateCompletionIsDisabled.java
View File

0
plugins/postfix/testData/completion/doNotShowTemplateInInappropriateContext.java → java/java-tests/testData/codeInsight/template/postfix/completion/doNotShowTemplateInInappropriateContext.java
View File

0
plugins/postfix/testData/completion/doNotShowTemplateOnCompletion.java → java/java-tests/testData/codeInsight/template/postfix/completion/doNotShowTemplateOnCompletion.java
View File

0
plugins/postfix/testData/completion/quickTypingWithEnter.java → java/java-tests/testData/codeInsight/template/postfix/completion/quickTypingWithEnter.java
View File

0
plugins/postfix/testData/completion/quickTypingWithEnter_after.java → java/java-tests/testData/codeInsight/template/postfix/completion/quickTypingWithEnter_after.java
View File

0
plugins/postfix/testData/completion/quickTypingWithTab.java → java/java-tests/testData/codeInsight/template/postfix/completion/quickTypingWithTab.java
View File

0
plugins/postfix/testData/completion/quickTypingWithTab_after.java → java/java-tests/testData/codeInsight/template/postfix/completion/quickTypingWithTab_after.java
View File

0
plugins/postfix/testData/completion/recalculatePrefix.java → java/java-tests/testData/codeInsight/template/postfix/completion/recalculatePrefix.java
View File

0
plugins/postfix/testData/completion/selectTemplateByEnter.java → java/java-tests/testData/codeInsight/template/postfix/completion/selectTemplateByEnter.java
View File

0
plugins/postfix/testData/completion/selectTemplateByEnter_after.java → java/java-tests/testData/codeInsight/template/postfix/completion/selectTemplateByEnter_after.java
View File

0
plugins/postfix/testData/completion/selectTemplateByTab.java → java/java-tests/testData/codeInsight/template/postfix/completion/selectTemplateByTab.java
View File

0
plugins/postfix/testData/completion/selectTemplateByTab_after.java → java/java-tests/testData/codeInsight/template/postfix/completion/selectTemplateByTab_after.java
View File

0
plugins/postfix/testData/completion/showTemplateInAutoPopup.java → java/java-tests/testData/codeInsight/template/postfix/completion/showTemplateInAutoPopup.java
View File

0
plugins/postfix/testData/completion/showTemplateOnDoubleLiteral.java → java/java-tests/testData/codeInsight/template/postfix/completion/showTemplateOnDoubleLiteral.java
View File

0
plugins/postfix/testData/templates/assert/booleanVariableBeforeAssignment.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/booleanVariableBeforeAssignment.java
View File

0
plugins/postfix/testData/templates/assert/booleanVariableBeforeAssignment_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/booleanVariableBeforeAssignment_after.java
View File

0
plugins/postfix/testData/templates/assert/boxedBooleanVariable.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/boxedBooleanVariable.java
View File

0
plugins/postfix/testData/templates/assert/boxedBooleanVariable_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/boxedBooleanVariable_after.java
View File

0
plugins/postfix/testData/templates/assert/instanceof.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/instanceof.java
View File

0
plugins/postfix/testData/templates/assert/instanceofBeforeReturnStatement.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/instanceofBeforeReturnStatement.java
View File

0
plugins/postfix/testData/templates/assert/instanceofBeforeReturnStatement_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/instanceofBeforeReturnStatement_after.java
View File

0
plugins/postfix/testData/templates/assert/instanceof_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/instanceof_after.java
View File

0
plugins/postfix/testData/templates/assert/integerComparison.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/integerComparison.java
View File

0
plugins/postfix/testData/templates/assert/integerComparison_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/integerComparison_after.java
View File

0
plugins/postfix/testData/templates/assert/methodInvocation.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/methodInvocation.java
View File

0
plugins/postfix/testData/templates/assert/methodInvocation_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/methodInvocation_after.java
View File

0
plugins/postfix/testData/templates/assert/notBooleanExpression.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/notBooleanExpression.java
View File

0
plugins/postfix/testData/templates/assert/notBooleanExpression_after.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/notBooleanExpression_after.java
View File

0
plugins/postfix/testData/templates/assert/notNull.java → java/java-tests/testData/codeInsight/template/postfix/templates/assert/notNull.java
View File

Some files were not shown because too many files have changed in this diff Show More