From 1979ce8e2c41f82174ab28b298fadd34d9723f0b Mon Sep 17 00:00:00 2001
From: Fabio Zadrozny <fabiofz@gmail.com>
Date: Sat, 14 Sep 2024 09:51:33 -0300
Subject: [PATCH] Moved AssistFString to core.

---
 plugins/org.python.pydev.core/META-INF/MANIFEST.MF              | 1 +
 .../org/python/pydev/core/assist_fstring}/AssistFString.java    | 2 +-
 .../editor/correctionassist/PythonCorrectionProcessor.java      | 2 +-
 .../editor/correctionassist/heuristics/AssistFStringTest.java   | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename plugins/{org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics => org.python.pydev.core/src/org/python/pydev/core/assist_fstring}/AssistFString.java (99%)

diff --git a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
index 9ee33c79e9..e3cebb0a31 100644
--- a/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
+++ b/plugins/org.python.pydev.core/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Require-Bundle: org.junit;bundle-version="4.0.0";resolution:=optional,
 Bundle-ActivationPolicy: lazy
 Export-Package: org.python.copiedfromeclipsesrc,
  org.python.pydev.core,
+ org.python.pydev.core.assist_fstring,
  org.python.pydev.core.autoedit,
  org.python.pydev.core.cache,
  org.python.pydev.core.concurrency,
diff --git a/plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistFString.java b/plugins/org.python.pydev.core/src/org/python/pydev/core/assist_fstring/AssistFString.java
similarity index 99%
rename from plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistFString.java
rename to plugins/org.python.pydev.core/src/org/python/pydev/core/assist_fstring/AssistFString.java
index e32b18590f..7ff0c04962 100644
--- a/plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistFString.java
+++ b/plugins/org.python.pydev.core/src/org/python/pydev/core/assist_fstring/AssistFString.java
@@ -1,4 +1,4 @@
-package org.python.pydev.editor.correctionassist.heuristics;
+package org.python.pydev.core.assist_fstring;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java b/plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java
index 84351e1284..ae4dd9604d 100644
--- a/plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java
+++ b/plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java
@@ -35,12 +35,12 @@
 import org.python.pydev.core.IPySyntaxHighlightingAndCodeCompletionEditor;
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.MisconfigurationException;
+import org.python.pydev.core.assist_fstring.AssistFString;
 import org.python.pydev.core.docstrings.AssistDocString;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.editor.PyEdit;
 import org.python.pydev.editor.correctionassist.heuristics.AssistAssign;
-import org.python.pydev.editor.correctionassist.heuristics.AssistFString;
 import org.python.pydev.editor.correctionassist.heuristics.AssistImport;
 import org.python.pydev.editor.correctionassist.heuristics.AssistImportToLocal;
 import org.python.pydev.editor.correctionassist.heuristics.AssistPercentToFormat;
diff --git a/plugins/org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistFStringTest.java b/plugins/org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistFStringTest.java
index f360353600..1e666adcc2 100644
--- a/plugins/org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistFStringTest.java
+++ b/plugins/org.python.pydev/tests/org/python/pydev/editor/correctionassist/heuristics/AssistFStringTest.java
@@ -11,6 +11,7 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.python.pydev.core.MisconfigurationException;
+import org.python.pydev.core.assist_fstring.AssistFString;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.proposals.CompletionProposalFactory;
 import org.python.pydev.editor.codecompletion.proposals.DefaultCompletionProposalFactory;