MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-17265 Move package "makeFunctionTopLevel" under "com.jetbrains.refactoring.move", add subpackage "moduleMembers"

Browse Source
This commit is contained in:
Mikhail Golubev
2016-10-25 00:03:49 +03:00
parent 61003f9cdd
commit bb1f03ca1a
15 changed files with 100 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/classes/PyMembersRefactoringSupport.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyElement;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.refactoring.classes.membersManager.PyMemberInfo;
import com.jetbrains.python.refactoring.move.PyDependentModuleMembersCollector;
import com.jetbrains.python.refactoring.move.moduleMembers.PyDependentModuleMembersCollector;
/**
* @author Dennis.Ushakov
python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolDelegate.java
+6 -3
View File
@@ -41,9 +41,12 @@ import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.psi.search.PyOverridingMethodsSearch;
import com.jetbrains.python.psi.search.PySuperMethodsSearch;
import com.jetbrains.python.psi.types.TypeEvalContext;
import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeFunctionTopLevelDialog;
import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeFunctionTopLevelDialog;
import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersDialog;
import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersHelper;
import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersProcessor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java → python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyBaseMakeFunctionTopLevelProcessor.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.refactoring.makeFunctionTopLevel;
package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
import com.intellij.codeInsight.controlflow.ControlFlow;
import com.intellij.codeInsight.controlflow.Instruction;
python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java → python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeFunctionTopLevelDialog.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.refactoring.makeFunctionTopLevel;
package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java → python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeLocalFunctionTopLevelProcessor.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.refactoring.makeFunctionTopLevel;
package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
import com.google.common.collect.Lists;
import com.intellij.psi.PsiElement;
python/src/com/jetbrains/python/refactoring/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java → python/src/com/jetbrains/python/refactoring/move/makeFunctionTopLevel/PyMakeMethodTopLevelProcessor.java
+1 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.refactoring.makeFunctionTopLevel;
package com.jetbrains.python.refactoring.move.makeFunctionTopLevel;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
python/src/com/jetbrains/python/refactoring/move/PyDependentModuleMembersCollector.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyDependentModuleMembersCollector.java
+16 -1
View File
@@ -1,4 +1,19 @@
package com.jetbrains.python.refactoring.move;
/*
* Copyright 2000-2015 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 com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfo.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfo.java
+16 -1
View File
@@ -1,4 +1,19 @@
package com.jetbrains.python.refactoring.move;
/*
* Copyright 2000-2015 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 com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.refactoring.classMembers.MemberInfoBase;
import com.jetbrains.python.psi.PyElement;
python/src/com/jetbrains/python/refactoring/move/PyModuleMemberInfoModel.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyModuleMemberInfoModel.java
+16 -1
View File
@@ -1,4 +1,19 @@
package com.jetbrains.python.refactoring.move;
/*
* Copyright 2000-2015 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 com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.refactoring.classMembers.AbstractUsesDependencyMemberInfoModel;
import com.jetbrains.python.psi.PyElement;
python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersDialog.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersDialog.java
+2 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.refactoring.move;
package com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.project.Project;
@@ -33,6 +33,7 @@ import com.jetbrains.python.psi.PyElement;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.refactoring.move.PyBaseMoveDialog;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersHelper.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersHelper.java
+16 -1
View File
@@ -1,4 +1,19 @@
package com.jetbrains.python.refactoring.move;
/*
* Copyright 2000-2015 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 com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
python/src/com/jetbrains/python/refactoring/move/PyMoveModuleMembersProcessor.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveModuleMembersProcessor.java
+2 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.python.refactoring.move;
package com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
@@ -34,6 +34,7 @@ import com.intellij.util.containers.MultiMap;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.refactoring.PyRefactoringUtil;
import com.jetbrains.python.refactoring.move.PyMoveRefactoringUtil;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolProcessor.java → python/src/com/jetbrains/python/refactoring/move/moduleMembers/PyMoveSymbolProcessor.java
+16 -1
View File
@@ -1,4 +1,19 @@
package com.jetbrains.python.refactoring.move;
/*
* Copyright 2000-2015 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 com.jetbrains.python.refactoring.move.moduleMembers;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.*;
python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
+2 -2
View File
@@ -26,8 +26,8 @@ import com.jetbrains.python.fixtures.PyTestCase;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
import com.jetbrains.python.refactoring.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeLocalFunctionTopLevelProcessor;
import com.jetbrains.python.refactoring.move.makeFunctionTopLevel.PyMakeMethodTopLevelProcessor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
python/testSrc/com/jetbrains/python/refactoring/PyMoveTest.java
+3 -3
View File
@@ -33,8 +33,8 @@ import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.stubs.PyClassNameIndex;
import com.jetbrains.python.psi.stubs.PyFunctionNameIndex;
import com.jetbrains.python.psi.stubs.PyVariableNameIndex;
import com.jetbrains.python.refactoring.move.PyMoveModuleMembersHelper;
import com.jetbrains.python.refactoring.move.PyMoveModuleMembersProcessor;
import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersHelper;
import com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersProcessor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -42,7 +42,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.List;
import static com.jetbrains.python.refactoring.move.PyMoveModuleMembersHelper.isMovableModuleMember;
import static com.jetbrains.python.refactoring.move.moduleMembers.PyMoveModuleMembersHelper.isMovableModuleMember;
/**
* @author vlan