Moved assist surround with to core.

plugins/org.python.pydev.ast/META-INF/MANIFEST.MF

@@ -33,6 +33,7 @@ Export-Package: org.python.pydev.ast,
  org.python.pydev.ast.runners,
  org.python.pydev.ast.simpleassist,
  org.python.pydev.ast.sort_imports,
+ org.python.pydev.ast.surround_with,
  org.python.pydev.core.pep8,
  org.python.pydev.core.templates,
  org.python.pydev.plugin,

plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistSurroundWith.java → plugins/org.python.pydev.ast/src/org/python/pydev/ast/surround_with/AssistSurroundWith.java

@@ -1,46 +1,45 @@
 /**
- * Copyright (c) 2005-2013 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2024 by Brainwy Software Ltda. All Rights Reserved.
  * Licensed under the terms of the Eclipse Public License (EPL).
  * Please see the license.txt included with this distribution for details.
  * Any modifications to this file must keep this entire header intact.
  */
-/*
- * Created on Apr 12, 2005
- *
- * @author Fabio Zadrozny
- */
-package org.python.pydev.editor.correctionassist.heuristics;
+package org.python.pydev.ast.surround_with;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.templates.DocumentTemplateContext;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateContext;
-import org.python.pydev.ast.codecompletion.AbstractTemplateCodeCompletion;
-import org.python.pydev.ast.codecompletion.CompletionRequest;
+import org.eclipse.jface.text.templates.TemplateContextType;
 import org.python.pydev.core.IAssistProps;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.IPythonNature;
-import org.python.pydev.core.TokensOrProposalsList;
 import org.python.pydev.core.autoedit.DefaultIndentPrefs;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.proposals.CompletionProposalFactory;
-import org.python.pydev.editor.codecompletion.PyTemplateProposal;
+import org.python.pydev.core.templates.PyAddTemplateResolvers;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 import org.python.pydev.shared_core.image.IImageCache;
 import org.python.pydev.shared_core.image.UIConstants;
 import org.python.pydev.shared_core.string.FastStringBuffer;
 import org.python.pydev.shared_core.string.StringUtils;
-import org.python.pydev.shared_ui.ImageCache;
 
 /**
  * @author Fabio Zadrozny
  */
-public class AssistSurroundWith extends AbstractTemplateCodeCompletion implements IAssistProps {
+public class AssistSurroundWith implements IAssistProps {
+
+    protected TemplateContext createContext(IRegion region, IDocument document) {
+        TemplateContextType contextType = new TemplateContextType();
+        PyAddTemplateResolvers.addDefaultResolvers(contextType);
+        return new DocumentTemplateContext(contextType, document, region.getOffset(), region.getLength());
+    }
 
     /**
      * @throws BadLocationException
@@ -107,10 +106,7 @@ public List<ICompletionProposalHandle> getProps(PySelection ps, IImageCache imag
 
         //region
         IRegion region = ps.getRegion();
-        TemplateContext context = null;
-        if (edit != null) {
-            context = createContext(region, ps.getDoc());
-        }
+        TemplateContext context = createContext(region, ps.getDoc());
 
         //not static because we need the actual code.
         String[] replace0to3 = new String[] { startIndent, delimiter, surroundedCode, delimiter, startIndent,
@@ -136,20 +132,8 @@ public List<ICompletionProposalHandle> getProps(PySelection ps, IImageCache imag
     private ICompletionProposalHandle createProposal(PySelection ps, IImageCache imageCache, IPyEdit edit,
             final String startIndent, IRegion region, int iComp, String comp, TemplateContext context) {
         Template t = new Template("Surround with", SURROUND_WITH_COMPLETIONS[iComp + 1], "", comp, false);
-        if (context != null) {
-            PyTemplateProposal proposal = new PyTemplateProposal(t, context, region,
-                    ImageCache.asImage(imageCache.get(UIConstants.COMPLETION_TEMPLATE)), 5) {
-                @Override
-                public String getAdditionalProposalInfo() {
-                    return startIndent + super.getAdditionalProposalInfo();
-                }
-            };
-            return proposal;
-        } else {
-            //In tests
-            return CompletionProposalFactory.get().createPyCompletionProposal(comp, region.getOffset(),
-                    region.getLength(), 0, 0);
-        }
+        return CompletionProposalFactory.get().createPyTemplateProposal(t, context, region,
+                imageCache == null ? null : imageCache.get(UIConstants.COMPLETION_TEMPLATE), 0);
     }
 
     /**
@@ -163,7 +147,7 @@ public String getAdditionalProposalInfo() {
      */
     public static final String[] SURROUND_WITH_COMPLETIONS = new String[] {
             "%stry:%s%s%s%sexcept${cursor}:%s%s%sraise", "try..except",
-            "%stry:%s%s%s%sexcept (${RuntimeError}, ), e:%s%s%s${raise}${cursor}", "try..except (RuntimeError, ), e",
+            "%stry:%s%s%s%sexcept ${Exception} as e:%s%s%s${raise}${cursor}", "try..except Exception as e",
             "%stry:%s%s%s%sfinally:%s%s%s${pass}", "try..finally", "%sif ${True}:%s%s%s%selse:%s%s%s${pass}",
             "if..else",
 
@@ -178,11 +162,4 @@ public boolean isValid(PySelection ps, String sel, IPyEdit edit, int offset) {
         return ps.getTextSelection().getLength() > 0;
     }
 
-    @Override
-    public TokensOrProposalsList getCodeCompletionProposals(CompletionRequest request)
-            throws CoreException,
-            BadLocationException {
-        throw new RuntimeException("Not implemented: completions should be gotten from the IAssistProps interface.");
-    }
-
 }

plugins/org.python.pydev/src/org/python/pydev/editor/PyInformationPresenter.java

@@ -298,7 +298,7 @@ private String trim(FastStringBuffer buffer, TextPresentation presentation) {
         }
 
         int start = 0;
-        while (start < end && Character.isWhitespace(buffer.charAt(start))) {
+        while (start < end && (buffer.charAt(start) == '\n' || buffer.charAt(start) == '\r')) {
             ++start;
         }
 

plugins/org.python.pydev/src/org/python/pydev/editor/correctionassist/PythonCorrectionProcessor.java

@@ -29,6 +29,7 @@
 import org.eclipse.ui.texteditor.spelling.SpellingCorrectionProcessor;
 import org.eclipse.ui.texteditor.spelling.SpellingProblem;
 import org.python.pydev.ast.codecompletion.ProposalsComparator;
+import org.python.pydev.ast.surround_with.AssistSurroundWith;
 import org.python.pydev.core.ExtensionHelper;
 import org.python.pydev.core.IAssistProps;
 import org.python.pydev.core.IPySyntaxHighlightingAndCodeCompletionEditor;
@@ -43,7 +44,6 @@
 import org.python.pydev.editor.correctionassist.heuristics.AssistImport;
 import org.python.pydev.editor.correctionassist.heuristics.AssistImportToLocal;
 import org.python.pydev.editor.correctionassist.heuristics.AssistPercentToFormat;
-import org.python.pydev.editor.correctionassist.heuristics.AssistSurroundWith;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 import org.python.pydev.shared_core.image.IImageCache;
 import org.python.pydev.shared_core.string.TextSelectionUtils;