wip2

fabioz · Sep 21, 2024 · 0769038 · 0769038
1 parent 113af65
commit 0769038
Show file tree

Hide file tree

Showing 19 changed files with 101 additions and 123 deletions.
diff --git a/plugins/org.python.pydev.ast/META-INF/MANIFEST.MF b/plugins/org.python.pydev.ast/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Export-Package: org.python.pydev.ast,
  org.python.pydev.ast.adapters.context,
  org.python.pydev.ast.adapters.offsetstrategy,
  org.python.pydev.ast.adapters.visitors,
+ org.python.pydev.ast.adapters.visitors.selection,
  org.python.pydev.ast.analysis,
  org.python.pydev.ast.analysis.messages,
  org.python.pydev.ast.builder,

diff --git a/plugins/org.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/VisitorFactory.java b/plugins/org.python.pydev.ast/src/org/python/pydev/ast/adapters/visitors/VisitorFactory.java
@@ -8,6 +8,9 @@
 import org.python.pydev.ast.adapters.ModuleAdapter;
 import org.python.pydev.ast.adapters.PythonModuleManager;
 import org.python.pydev.ast.adapters.context.AbstractContextVisitor;
+import org.python.pydev.ast.adapters.visitors.selection.SelectionException;
+import org.python.pydev.ast.adapters.visitors.selection.SelectionExtenderVisitor;
+import org.python.pydev.ast.adapters.visitors.selection.SelectionValidationVisitor;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceModule;
 import org.python.pydev.core.BaseModuleRequest;
 import org.python.pydev.core.IGrammarVersionProvider;
@@ -109,4 +112,28 @@ public AdditionalGrammarVersionsToCheck getAdditionalGrammarVersions()
         return new ModuleAdapter(pythonModuleManager, file, doc, org.python.pydev.parser.PyParser.parseSimple(doc, versionProvider), nature);
     }
 
+    public static void validateSelection(ModuleAdapter scope) throws SelectionException {
+        SelectionValidationVisitor visitor = null;
+        try {
+            visitor = new SelectionValidationVisitor();
+            scope.getASTNode().accept(visitor);
+        } catch (SelectionException e) {
+            throw e;
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static ICoreTextSelection createSelectionExtension(AbstractScopeNode<?> scope,
+            ICoreTextSelection selection) {
+        SelectionExtenderVisitor visitor = null;
+        try {
+            visitor = new SelectionExtenderVisitor(scope.getModule(), selection);
+            scope.getASTNode().accept(visitor);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return visitor.getSelection();
+    }
+
 }
diff --git a/...isitors/selection/SelectionException.java → ...isitors/selection/SelectionException.java b/...isitors/selection/SelectionException.java → ...isitors/selection/SelectionException.java
@@ -22,7 +22,7 @@
  * 
  */
 
-package org.python.pydev.refactoring.ast.visitors.selection;
+package org.python.pydev.ast.adapters.visitors.selection;
 
 import org.python.pydev.parser.jython.SimpleNode;
 

diff --git a/...s/selection/SelectionExtenderVisitor.java → ...s/selection/SelectionExtenderVisitor.java b/...s/selection/SelectionExtenderVisitor.java → ...s/selection/SelectionExtenderVisitor.java
@@ -22,7 +22,7 @@
  *
  */
 
-package org.python.pydev.refactoring.ast.visitors.selection;
+package org.python.pydev.ast.adapters.visitors.selection;
 
 import java.util.List;
 

diff --git a/...selection/SelectionValidationVisitor.java → ...selection/SelectionValidationVisitor.java b/...selection/SelectionValidationVisitor.java → ...selection/SelectionValidationVisitor.java
@@ -22,7 +22,7 @@
  * 
  */
 
-package org.python.pydev.refactoring.ast.visitors.selection;
+package org.python.pydev.ast.adapters.visitors.selection;
 
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor;
 import org.python.pydev.parser.jython.SimpleNode;

diff --git a/...ython.pydev.refactoring/src/org/python/pydev/refactoring/ast/visitors/VisitorFactory.java b/...ython.pydev.refactoring/src/org/python/pydev/refactoring/ast/visitors/VisitorFactory.java
diff --git a/.../org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java b/.../org/python/pydev/refactoring/coderefactoring/extractmethod/ExtractMethodRefactoring.java
@@ -14,12 +14,12 @@
 * Contributors:
 *     Fabio Zadrozny <[email protected]> - initial implementation
 ******************************************************************************/
-/* 
+/*
  * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  * Copyright (C) 2007  Reto Schuettel, Robin Stocker
  *
  * IFS Institute for Software, HSR Rapperswil, Switzerland
- * 
+ *
  */
 
 package org.python.pydev.refactoring.coderefactoring.extractmethod;
@@ -32,9 +32,8 @@
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
 import org.python.pydev.ast.adapters.ModuleAdapter;
+import org.python.pydev.ast.adapters.visitors.selection.SelectionException;
 import org.python.pydev.core.log.Log;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
-import org.python.pydev.refactoring.ast.visitors.selection.SelectionException;
 import org.python.pydev.refactoring.core.base.AbstractPythonRefactoring;
 import org.python.pydev.refactoring.core.base.RefactoringInfo;
 import org.python.pydev.refactoring.core.base.RefactoringInfo.SelectionComputer;
@@ -70,7 +69,8 @@ public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws Core
         }
 
         try {
-            VisitorFactory.validateSelection(selectionComputer.selectionModuleAdapter);
+            org.python.pydev.ast.adapters.visitors.VisitorFactory
+                    .validateSelection(selectionComputer.selectionModuleAdapter);
         } catch (SelectionException e) {
             status.addFatalError(e.getMessage());
             return status;

diff --git a/....python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/RefactoringInfo.java b/....python.pydev.refactoring/src/org/python/pydev/refactoring/core/base/RefactoringInfo.java
@@ -56,7 +56,6 @@
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.parser.jython.ast.stmtType;
 import org.python.pydev.parser.jython.ast.factory.AdapterPrefs;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.shared_core.SharedCorePlugin;
 import org.python.pydev.shared_core.string.CoreTextSelection;
 import org.python.pydev.shared_core.string.ICoreTextSelection;
@@ -133,7 +132,8 @@ private void initInfo(ICoreTextSelection selection) {
         }
 
         try {
-            this.moduleAdapter = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(moduleManager, realFile, doc, nature,
+            this.moduleAdapter = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(
+                    moduleManager, realFile, doc, nature,
                     this.versionProvider);
         } catch (Throwable e) {
             throw new RuntimeException(e);
@@ -314,7 +314,8 @@ private ModuleAdapter getParsedMultilineSelection(RefactoringInfo info, ICoreTex
             source = source.replaceAll("\r", "");
 
             try {
-                ModuleAdapter node = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null, new Document(source), null,
+                ModuleAdapter node = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null,
+                        null, new Document(source), null,
                         info.getVersionProvider());
                 return node;
             } catch (TokenMgrError e) {
@@ -335,8 +336,9 @@ public SelectionComputer getSelectionComputer(SelectionComputer.SelectionCompute
 
     private ICoreTextSelection getExtendedSelection() {
         if (getScopeAdapter() != null) {
-            return moduleAdapter.normalizeSelection(VisitorFactory.createSelectionExtension(
-                    getScopeAdapter(), this.userSelection));
+            return moduleAdapter
+                    .normalizeSelection(org.python.pydev.ast.adapters.visitors.VisitorFactory.createSelectionExtension(
+                            getScopeAdapter(), this.userSelection));
         }
         return null;
     }
@@ -351,7 +353,8 @@ private ModuleAdapter getParsedSelection(ICoreTextSelection selection) {
 
         if (selection != null && source.length() > 0) {
             try {
-                parsedAdapter = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(moduleManager, null, new Document(source), nature,
+                parsedAdapter = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(moduleManager,
+                        null, new Document(source), nature,
                         this.versionProvider);
             } catch (TokenMgrError e) {
                 return null;

diff --git a/...actoring/tests/org/python/pydev/refactoring/tests/adapter/FunctionDefAdapterTestCase.java b/...actoring/tests/org/python/pydev/refactoring/tests/adapter/FunctionDefAdapterTestCase.java
@@ -12,8 +12,8 @@
 * Contributors:
 *     Fabio Zadrozny <[email protected]> - initial implementation
 ******************************************************************************/
-/* 
- * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler 
+/*
+ * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  */
 
 package org.python.pydev.refactoring.tests.adapter;
@@ -24,7 +24,6 @@
 import org.python.pydev.ast.adapters.FunctionDefAdapter;
 import org.python.pydev.ast.adapters.IClassDefAdapter;
 import org.python.pydev.ast.adapters.ModuleAdapter;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.refactoring.tests.core.AbstractIOTestCase;
 
 public class FunctionDefAdapterTestCase extends AbstractIOTestCase {
@@ -37,7 +36,8 @@ public FunctionDefAdapterTestCase(String name) {
     @Override
     public void runTest() throws Throwable {
         StringBuffer buffer = new StringBuffer();
-        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null, new Document(data.source),
+        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null,
+                new Document(data.source),
                 new PythonNatureStub(), createVersionProvider());
         List<IClassDefAdapter> classes = module.getClasses();
         assertTrue(classes.size() > 0);

diff --git a/...pydev.refactoring/tests/org/python/pydev/refactoring/tests/adapter/HierarchyTestCase.java b/...pydev.refactoring/tests/org/python/pydev/refactoring/tests/adapter/HierarchyTestCase.java
@@ -37,7 +37,6 @@
 import org.python.pydev.ast.codecompletion.shell.PythonShellTest;
 import org.python.pydev.core.ShellId;
 import org.python.pydev.core.TestDependent;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.shared_core.io.FileUtils;
 
 public class HierarchyTestCase extends CodeCompletionTestsBase {
@@ -84,8 +83,9 @@ public void tearDown() throws Exception {
 
     public void testHierarchyWithBuiltins() throws Throwable {
 
-        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(new PythonModuleManager(nature), file, new Document(
-                FileUtils.getFileContents(file)), nature, nature);
+        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory
+                .createModuleAdapter(new PythonModuleManager(nature), file, new Document(
+                        FileUtils.getFileContents(file)), nature, nature);
 
         List<IClassDefAdapter> classes = module.getClasses();
         assertEquals(1, classes.size());

diff --git a/...v.refactoring/tests/org/python/pydev/refactoring/tests/adapter/ModuleAdapterTestCase.java b/...v.refactoring/tests/org/python/pydev/refactoring/tests/adapter/ModuleAdapterTestCase.java
@@ -24,7 +24,6 @@
 import org.eclipse.jface.text.Document;
 import org.python.pydev.ast.adapters.FQIdentifier;
 import org.python.pydev.ast.adapters.ModuleAdapter;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.refactoring.tests.core.AbstractIOTestCase;
 
 import com.thoughtworks.xstream.XStream;
@@ -47,7 +46,8 @@ public void runTest() throws Throwable {
         });
         xstream.alias("config", ModuleAdapterTestConfig.class);
 
-        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null, new Document(data.source),
+        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null,
+                new Document(data.source),
                 new PythonNatureStub(), createVersionProvider());
         if (data.config.length() > 0) {
             config = (ModuleAdapterTestConfig) xstream.fromXML(data.config);

diff --git a/.../pydev/refactoring/tests/codegenerator/generateproperties/GeneratePropertiesTestCase.java b/.../pydev/refactoring/tests/codegenerator/generateproperties/GeneratePropertiesTestCase.java
@@ -12,8 +12,8 @@
 * Contributors:
 *     Fabio Zadrozny <[email protected]> - initial implementation
 ******************************************************************************/
-/* 
- * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler 
+/*
+ * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  */
 
 package org.python.pydev.refactoring.tests.codegenerator.generateproperties;
@@ -30,7 +30,6 @@
 import org.python.pydev.ast.adapters.IClassDefAdapter;
 import org.python.pydev.ast.adapters.ModuleAdapter;
 import org.python.pydev.core.MisconfigurationException;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.refactoring.codegenerator.generateproperties.edit.DeleteMethodEdit;
 import org.python.pydev.refactoring.codegenerator.generateproperties.edit.GetterMethodEdit;
 import org.python.pydev.refactoring.codegenerator.generateproperties.edit.PropertyEdit;
@@ -90,7 +89,8 @@ private IDocument applyGenerateProperties(MockupGeneratePropertiesRequestProcess
 
     private MockupGeneratePropertiesRequestProcessor setupRequestProcessor(MockupGeneratePropertiesConfig config)
             throws Throwable {
-        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null, new Document(data.source),
+        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null,
+                new Document(data.source),
                 new PythonNatureStub(), createVersionProvider());
         List<IClassDefAdapter> classes = module.getClasses();
         assertTrue(classes.size() > 0);

diff --git a/...g/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java b/...g/python/pydev/refactoring/tests/coderefactoring/extractmethod/ExtractMethodTestCase.java
@@ -14,7 +14,7 @@
 * Contributors:
 *     Fabio Zadrozny <[email protected]> - initial implementation
 ******************************************************************************/
-/* 
+/*
  * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  * Copyright (C) 2007  Reto Schuettel, Robin Stocker
  */
@@ -35,7 +35,6 @@
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.parser.jython.ParseException;
 import org.python.pydev.parser.jython.ast.Module;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ExtractCallEdit;
 import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ExtractMethodEdit;
 import org.python.pydev.refactoring.coderefactoring.extractmethod.edit.ParameterReturnDeduce;

diff --git a/...n.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/AbstractIOTestCase.java b/...n.pydev.refactoring/tests/org/python/pydev/refactoring/tests/core/AbstractIOTestCase.java
@@ -33,7 +33,6 @@
 import org.python.pydev.core.IGrammarVersionProvider;
 import org.python.pydev.core.IModulesManager;
 import org.python.pydev.core.MisconfigurationException;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.shared_core.io.FileUtils;
 import org.python.pydev.shared_core.string.StringUtils;
 
@@ -64,8 +63,9 @@ protected ModuleAdapter createModuleAdapterFromDataSource(String version) throws
 
                 CodeCompletionTestsBase.nature.setVersion(version, null);
             }
-            ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(pythonModuleManager, data.file, new Document(
-                    data.source), CodeCompletionTestsBase.nature, CodeCompletionTestsBase.nature);
+            ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory
+                    .createModuleAdapter(pythonModuleManager, data.file, new Document(
+                            data.source), CodeCompletionTestsBase.nature, CodeCompletionTestsBase.nature);
             return module;
         } catch (Exception e) {
             throw new RuntimeException("Error handling: " + data.file);

diff --git a/...factoring/tests/org/python/pydev/refactoring/tests/visitors/AttributeVisitorTestCase.java b/...factoring/tests/org/python/pydev/refactoring/tests/visitors/AttributeVisitorTestCase.java
@@ -12,8 +12,8 @@
 * Contributors:
 *     Fabio Zadrozny <[email protected]> - initial implementation
 ******************************************************************************/
-/* 
- * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler 
+/*
+ * Copyright (C) 2006, 2007  Dennis Hunziker, Ueli Kistler
  */
 
 package org.python.pydev.refactoring.tests.visitors;
@@ -27,7 +27,6 @@
 import org.python.pydev.ast.adapters.context.ClassDefVisitor;
 import org.python.pydev.ast.adapters.context.GlobalAttributeVisitor;
 import org.python.pydev.ast.adapters.context.LocalAttributeVisitor;
-import org.python.pydev.refactoring.ast.visitors.VisitorFactory;
 import org.python.pydev.refactoring.tests.adapter.PythonNatureStub;
 import org.python.pydev.refactoring.tests.core.AbstractIOTestCase;
 
@@ -40,16 +39,20 @@ public AttributeVisitorTestCase(String name) {
     @Override
     public void runTest() throws Throwable {
         StringBuffer buffer = new StringBuffer();
-        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null, new Document(data.source),
+        ModuleAdapter module = org.python.pydev.ast.adapters.visitors.VisitorFactory.createModuleAdapter(null, null,
+                new Document(data.source),
                 new PythonNatureStub(), createVersionProvider());
-        GlobalAttributeVisitor globalVisitor = org.python.pydev.ast.adapters.visitors.VisitorFactory.createContextVisitor(GlobalAttributeVisitor.class,
-                module.getASTNode(), module, module);
-        ClassDefVisitor classVisitor = org.python.pydev.ast.adapters.visitors.VisitorFactory.createContextVisitor(ClassDefVisitor.class, module.getASTNode(),
+        GlobalAttributeVisitor globalVisitor = org.python.pydev.ast.adapters.visitors.VisitorFactory
+                .createContextVisitor(GlobalAttributeVisitor.class,
+                        module.getASTNode(), module, module);
+        ClassDefVisitor classVisitor = org.python.pydev.ast.adapters.visitors.VisitorFactory.createContextVisitor(
+                ClassDefVisitor.class, module.getASTNode(),
                 module, module);
         assertTrue(classVisitor.getAll().size() > 0);
 
         ClassDefAdapter classDefAdapter = (ClassDefAdapter) classVisitor.getAll().get(0);
-        LocalAttributeVisitor localVisitor = org.python.pydev.ast.adapters.visitors.VisitorFactory.createContextVisitor(LocalAttributeVisitor.class,
+        LocalAttributeVisitor localVisitor = org.python.pydev.ast.adapters.visitors.VisitorFactory.createContextVisitor(
+                LocalAttributeVisitor.class,
                 classDefAdapter.getASTNode(), module, classDefAdapter);
         printAttributes(buffer, globalVisitor);
         printAttributes(buffer, localVisitor);
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ @@
      *
      */
-    package org.python.pydev.refactoring.ast.visitors.selection;
+    package org.python.pydev.ast.adapters.visitors.selection;
     import org.python.pydev.parser.jython.SimpleNode;
@@ Expand Down @@