wip

fabioz · Sep 29, 2024 · 411236f · 411236f
1 parent ee91c07
commit 411236f
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 13 deletions.
diff --git a/...v.refactoring/src/com/python/pydev/refactoring/tdd/TddQuickFixFromMarkersParticipant.java b/...v.refactoring/src/com/python/pydev/refactoring/tdd/TddQuickFixFromMarkersParticipant.java
@@ -58,6 +58,9 @@
 import com.python.pydev.analysis.refactoring.tdd.NullPyCreateAction;
 import com.python.pydev.analysis.refactoring.tdd.PyCreateClass;
 import com.python.pydev.analysis.refactoring.tdd.PyCreateMethodOrField;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletion;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletionInInexistentModule;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletionInModule;
 
 /**
  * This participant will add a suggestion to create class/methods/attributes when an undefined variable error is found.

diff --git a/...ring/tests/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipantTest.java b/...ring/tests/com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipantTest.java
@@ -30,6 +30,8 @@
 import com.python.pydev.analysis.refactoring.tdd.AbstractPyCreateClassOrMethodOrField;
 import com.python.pydev.analysis.refactoring.tdd.TddCodeGenerationQuickFixWithoutMarkersParticipant;
 import com.python.pydev.analysis.refactoring.tdd.TemplateInfo;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletion;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletionInModule;
 
 /**
  * @author Fabio

diff --git a/...com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipantWithMarkersTest.java b/...com/python/pydev/refactoring/tdd/TddCodeGenerationQuickFixParticipantWithMarkersTest.java
@@ -42,6 +42,8 @@
 import com.python.pydev.analysis.refactoring.refactorer.Refactorer;
 import com.python.pydev.analysis.refactoring.tdd.TddCodeGenerationQuickFixWithoutMarkersParticipant;
 import com.python.pydev.analysis.refactoring.tdd.TemplateInfo;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletion;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletionInModule;
 
 /**
  * @author Fabio

diff --git a/...org.python.pydev.core/src/org/python/pydev/core/proposals/ICompletionProposalFactory.java b/...org.python.pydev.core/src/org/python/pydev/core/proposals/ICompletionProposalFactory.java
@@ -136,15 +136,18 @@ ICompletionProposalHandle createMoveImportsToLocalCompletionProposal(
 
     ShellId getCythonShellId();
 
-    ICompletionProposalHandle createTddRefactorCompletion(String markerContents, IImageHandle iImageHandle,
-            String displayString, Object object, Object object2, int priorityCreate, IPyEdit edit,
-            int locationStrategyBeforeCurrent, List<String> parametersAfterCall,
-            /*PyCreateMethodOrField*/ Object pyCreateMethod,
+    ICompletionProposalHandle createTddRefactorCompletion(String replacementString, IImageHandle image,
+            String displayString,
+            /*IContextInformation*/Object contextInformation, String additionalProposalInfo, int priority, IPyEdit edit,
+            int locationStrategy, List<String> parametersAfterCall, /*PyCreateMethodOrField*/Object pyCreateAction,
             PySelection ps);
 
-    ICompletionProposalHandle createTddRefactorCompletionInModule(String string, IImageHandle iImageHandle,
-            String displayString, Object object, String displayString2, int priorityCreate, IPyEdit edit, File file,
-            List<String> parametersAfterCall, /*PyCreateMethodOrField*/ Object pyCreateMethod, PySelection callPs,
-            int locationStrategyFirstMethod);
+    ICompletionProposalHandle createTddRefactorCompletionInModule(String replacementString, IImageHandle image,
+            String displayString,
+            /*IContextInformation*/ Object contextInformation, String additionalProposalInfo, int priority,
+            IPyEdit edit,
+            File module, List<String> parametersAfterCall, /*AbstractPyCreateAction*/ Object pyCreateAction,
+            PySelection ps,
+            int locationStrategy);
 
 }
diff --git a/plugins/org.python.pydev/META-INF/MANIFEST.MF b/plugins/org.python.pydev/META-INF/MANIFEST.MF
@@ -50,6 +50,7 @@ Export-Package: com.python.pydev.actions,
  com.python.pydev.analysis.ctrl_1,
  com.python.pydev.analysis.indexview,
  com.python.pydev.analysis.ui,
+ com.python.pydev.refactoring.tdd.completions,
  com.python.pydev.ui.hierarchy,
  org.python.copiedfromeclipsesrc,
  org.python.pydev.ast.codecompletion,

diff --git a/...ng/tdd/AbstractTddRefactorCompletion.java → ...etions/AbstractTddRefactorCompletion.java b/...ng/tdd/AbstractTddRefactorCompletion.java → ...etions/AbstractTddRefactorCompletion.java
@@ -4,7 +4,7 @@
  * Please see the license.txt included with this distribution for details.
  * Any modifications to this file must keep this entire header intact.
  */
-package com.python.pydev.refactoring.tdd;
+package com.python.pydev.refactoring.tdd.completions;
 
 import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
 import org.eclipse.jface.text.contentassist.IContextInformation;

diff --git a/...efactoring/tdd/TddRefactorCompletion.java → ...dd/completions/TddRefactorCompletion.java b/...efactoring/tdd/TddRefactorCompletion.java → ...dd/completions/TddRefactorCompletion.java
@@ -4,7 +4,7 @@
  * Please see the license.txt included with this distribution for details.
  * Any modifications to this file must keep this entire header intact.
  */
-package com.python.pydev.refactoring.tdd;
+package com.python.pydev.refactoring.tdd.completions;
 
 import java.util.List;
 
@@ -39,7 +39,7 @@ public final class TddRefactorCompletion extends AbstractTddRefactorCompletion {
     private PySelection ps;
     private TemplateInfo templateInfo;
 
-    TddRefactorCompletion(String replacementString, IImageHandle image, String displayString,
+    public TddRefactorCompletion(String replacementString, IImageHandle image, String displayString,
             IContextInformation contextInformation, String additionalProposalInfo, int priority, IPyEdit edit,
             int locationStrategy, List<String> parametersAfterCall, AbstractPyCreateAction pyCreateAction,
             PySelection ps) {

diff --git a/...RefactorCompletionInInexistentModule.java → ...RefactorCompletionInInexistentModule.java b/...RefactorCompletionInInexistentModule.java → ...RefactorCompletionInInexistentModule.java
@@ -4,7 +4,7 @@
  * Please see the license.txt included with this distribution for details.
  * Any modifications to this file must keep this entire header intact.
  */
-package com.python.pydev.refactoring.tdd;
+package com.python.pydev.refactoring.tdd.completions;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

diff --git a/...ng/tdd/TddRefactorCompletionInModule.java → ...etions/TddRefactorCompletionInModule.java b/...ng/tdd/TddRefactorCompletionInModule.java → ...etions/TddRefactorCompletionInModule.java
@@ -4,7 +4,7 @@
  * Please see the license.txt included with this distribution for details.
  * Any modifications to this file must keep this entire header intact.
  */
-package com.python.pydev.refactoring.tdd;
+package com.python.pydev.refactoring.tdd.completions;
 
 import java.io.File;
 import java.util.List;

diff --git a/...rc/org/python/pydev/editor/codecompletion/proposals/DefaultCompletionProposalFactory.java b/...rc/org/python/pydev/editor/codecompletion/proposals/DefaultCompletionProposalFactory.java
@@ -1,5 +1,6 @@
 package org.python.pydev.editor.codecompletion.proposals;
 
+import java.io.File;
 import java.util.List;
 
 import org.eclipse.jface.text.IRegion;
@@ -35,6 +36,10 @@
 import org.python.pydev.shared_core.string.FastStringBuffer;
 import org.python.pydev.shared_ui.ImageCache;
 
+import com.python.pydev.analysis.refactoring.tdd.AbstractPyCreateAction;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletion;
+import com.python.pydev.refactoring.tdd.completions.TddRefactorCompletionInModule;
+
 public class DefaultCompletionProposalFactory implements ICompletionProposalFactory {
 
     @Override
@@ -273,4 +278,31 @@ public ICompletionProposalHandle createMoveImportsToLocalCompletionProposal(Obje
                 importHandleInfo, iImageHandle, displayString);
     }
 
+    @Override
+    public ICompletionProposalHandle createTddRefactorCompletion(String replacementString, IImageHandle image,
+            String displayString,
+            /*IContextInformation*/ Object contextInformation, String additionalProposalInfo, int priority,
+            IPyEdit edit,
+            int locationStrategy, List<String> parametersAfterCall, /*AbstractPyCreateAction*/ Object pyCreateAction,
+            PySelection ps) {
+        return new TddRefactorCompletion(replacementString, image, displayString,
+                (IContextInformation) contextInformation, additionalProposalInfo,
+                priority, edit, locationStrategy, parametersAfterCall, (AbstractPyCreateAction) pyCreateAction, ps);
+    }
+
+    @Override
+    public ICompletionProposalHandle createTddRefactorCompletionInModule(String replacementString, IImageHandle image,
+            String displayString,
+            /*IContextInformation*/ Object contextInformation, String additionalProposalInfo, int priority,
+            IPyEdit edit,
+            File module, List<String> parametersAfterCall, /*AbstractPyCreateAction*/ Object pyCreateAction,
+            PySelection ps,
+            int locationStrategy) {
+        return new TddRefactorCompletionInModule(replacementString, image, displayString,
+                (IContextInformation) contextInformation,
+                additionalProposalInfo, priority, edit, module, parametersAfterCall,
+                (AbstractPyCreateAction) pyCreateAction, ps,
+                locationStrategy);
+    }
+
 }