wip

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/AbstractAnalysisPreferences.java

@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
+import org.python.pydev.core.IAnalysisPreferences;
 
 public abstract class AbstractAnalysisPreferences implements IAnalysisPreferences {
 

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPreferences.java

@@ -17,7 +17,7 @@
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.preferences.PydevPrefs;
 import org.python.pydev.shared_core.SharedCorePlugin;
 import org.python.pydev.shared_core.preferences.IScopedPreferences;
@@ -119,7 +119,7 @@ private Map<Integer, Integer> getSeverityTypeMap() {
     /**
      * return the severity based on the user-set values
      *
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#getSeverityForType(int)
+     * @see org.python.pydev.core.IAnalysisPreferences#getSeverityForType(int)
      */
     @Override
     public int getSeverityForType(int type) {
@@ -134,7 +134,7 @@ public int getSeverityForType(int type) {
     /**
      * yeah, we always do code analysis...
      *
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#makeCodeAnalysis()
+     * @see org.python.pydev.core.IAnalysisPreferences#makeCodeAnalysis()
      */
     @Override
     public boolean makeCodeAnalysis() {
@@ -147,7 +147,7 @@ public boolean makeCodeAnalysis() {
     }
 
     /**
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#getNamesIgnoredByUnusedVariable()
+     * @see org.python.pydev.core.IAnalysisPreferences#getNamesIgnoredByUnusedVariable()
      */
     @Override
     public Set<String> getNamesIgnoredByUnusedVariable() {
@@ -177,7 +177,7 @@ private Set<String> getSetOfNames(String preferencesName) {
     }
 
     /**
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#getModuleNamePatternsToBeIgnored()
+     * @see org.python.pydev.core.IAnalysisPreferences#getModuleNamePatternsToBeIgnored()
      */
     @Override
     public Set<String> getModuleNamePatternsToBeIgnored() {

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/OccurrencesAnalyzer.java

@@ -16,10 +16,10 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.analysis.messages.IMessage;
 import org.python.pydev.ast.analysis.messages.Message;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceModule;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IIndentPrefs;
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.log.Log;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/builders/AnalysisBuilderRunnable.java

@@ -20,11 +20,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.analysis.messages.IMessage;
 import org.python.pydev.ast.builder.PyDevBuilderVisitor;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceModule;
 import org.python.pydev.core.CheckAnalysisErrors;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IModule;
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.MisconfigurationException;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/pep8/Pep8Visitor.java

@@ -15,12 +15,12 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.analysis.messages.IMessage;
 import org.python.pydev.ast.analysis.messages.Message;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceModule;
 import org.python.pydev.core.CheckAnalysisErrors;
 import org.python.pydev.core.CorePlugin;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.log.Log;
 import org.python.pydev.core.pep8.Pep8Runner;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/tabnanny/TabNanny.java

@@ -14,9 +14,9 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.analysis.messages.IMessage;
 import org.python.pydev.ast.analysis.messages.Message;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IIndentPrefs;
 import org.python.pydev.core.docutils.PySelection;
 import org.python.pydev.core.docutils.TabNannyDocIterator;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/DuplicationChecker.java

@@ -12,9 +12,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceToken;
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IModule;
 import org.python.pydev.core.IPythonNature;
 import org.python.pydev.parser.jython.SimpleNode;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/MessagesManager.java

@@ -18,14 +18,14 @@
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.analysis.messages.CompositeMessage;
 import org.python.pydev.ast.analysis.messages.IMessage;
 import org.python.pydev.ast.analysis.messages.Message;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceToken;
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor;
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor.ImportPartSourceToken;
 import org.python.pydev.core.CheckAnalysisErrors;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IToken;
 import org.python.pydev.core.docutils.ParsingUtils;
 import org.python.pydev.core.docutils.PySelection;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/NoSelfChecker.java

@@ -12,9 +12,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceToken;
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.ICompletionCache;
 import org.python.pydev.core.IModule;
 import org.python.pydev.parser.jython.ast.Assign;

plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/OccurrencesVisitor.java

@@ -19,12 +19,12 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.analysis.messages.IMessage;
 import org.python.pydev.ast.analysis.messages.Message;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceToken;
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor;
 import org.python.pydev.ast.codecompletion.revisited.visitors.Definition;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IDefinition;
 import org.python.pydev.core.IModule;
 import org.python.pydev.core.IPythonNature;

plugins/com.python.pydev.refactoring/src/com/python/pydev/refactoring/tdd/TddQuickFixParticipant.java

@@ -11,12 +11,10 @@
 import java.util.HashSet;
 import java.util.List;
 
-import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.codecompletion.revisited.CompletionCache;
 import org.python.pydev.ast.codecompletion.revisited.CompletionState;
 import org.python.pydev.ast.codecompletion.revisited.CompletionStateFactory;
@@ -25,9 +23,12 @@
 import org.python.pydev.ast.codecompletion.revisited.visitors.Definition;
 import org.python.pydev.ast.refactoring.PyRefactoringFindDefinition;
 import org.python.pydev.ast.refactoring.RefactoringRequest;
+import org.python.pydev.core.IAnalysisMarkersParticipant;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.ICodeCompletionASTManager;
 import org.python.pydev.core.ICompletionState;
 import org.python.pydev.core.IDefinition;
+import org.python.pydev.core.IMarkerInfoForAnalysis;
 import org.python.pydev.core.IModule;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.IPythonNature;
@@ -38,7 +39,6 @@
 import org.python.pydev.core.log.Log;
 import org.python.pydev.core.preferences.FileTypesPreferences;
 import org.python.pydev.core.structure.CompletionRecursionException;
-import org.python.pydev.editor.codefolding.MarkerAnnotationAndPosition;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.ClassDef;
 import org.python.pydev.parser.visitors.NodeUtils;
@@ -54,8 +54,6 @@
 import org.python.pydev.shared_core.structure.Tuple;
 import org.python.pydev.shared_ui.SharedUiPlugin;
 
-import com.python.pydev.analysis.additionalinfo.builders.AnalysisRunner;
-import com.python.pydev.analysis.ctrl_1.IAnalysisMarkersParticipant;
 import com.python.pydev.analysis.refactoring.tdd.NullPyCreateAction;
 import com.python.pydev.analysis.refactoring.tdd.PyCreateClass;
 import com.python.pydev.analysis.refactoring.tdd.PyCreateMethodOrField;
@@ -79,7 +77,7 @@ public TddQuickFixParticipant() {
     }
 
     @Override
-    public void addProps(MarkerAnnotationAndPosition markerAnnotation, IAnalysisPreferences analysisPreferences,
+    public void addProps(IMarkerInfoForAnalysis markerInfo, IAnalysisPreferences analysisPreferences,
             String line, PySelection ps, int offset, IPythonNature nature, IPyEdit edit,
             List<ICompletionProposalHandle> props)
             throws BadLocationException, CoreException {
@@ -92,13 +90,13 @@ public void addProps(MarkerAnnotationAndPosition markerAnnotation, IAnalysisPref
             return;
         }
 
-        if (markerAnnotation.position == null) {
+        if (!markerInfo.hasPosition()) {
             return;
         }
-        IMarker marker = markerAnnotation.markerAnnotation.getMarker();
-        Integer id = (Integer) marker.getAttribute(AnalysisRunner.PYDEV_ANALYSIS_TYPE);
-        int start = markerAnnotation.position.offset;
-        int end = start + markerAnnotation.position.length;
+        Integer id = markerInfo.getPyDevAnalisysType();
+        int start = markerInfo.getOffset();
+        int end = start + markerInfo.getLength();
+
         ps.setSelection(start, end);
         String markerContents;
         try {

plugins/org.python.pydev.ast/src/org/python/pydev/ast/analysis/messages/AbstractMessage.java

@@ -18,9 +18,9 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
 import org.python.pydev.ast.codecompletion.revisited.modules.SourceToken;
 import org.python.pydev.ast.codecompletion.revisited.visitors.AbstractVisitor;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IToken;
 import org.python.pydev.parser.jython.SimpleNode;
 import org.python.pydev.parser.jython.ast.Import;

plugins/org.python.pydev.ast/src/org/python/pydev/ast/analysis/messages/CompositeMessage.java

@@ -14,7 +14,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IToken;
 import org.python.pydev.shared_core.string.FastStringBuffer;
 

plugins/org.python.pydev.ast/src/org/python/pydev/ast/analysis/messages/IMessage.java

@@ -25,21 +25,21 @@ public interface IMessage {
     int getSeverity();
 
     /**
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_DUPLICATED_SIGNATURE
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_NO_SELF
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_REIMPORT
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_UNDEFINED_VARIABLE
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_UNRESOLVED_IMPORT
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_UNUSED_IMPORT
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_UNUSED_VARIABLE
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_UNUSED_PARAMETER
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_UNUSED_WILD_IMPORT
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_USED_WILD_IMPORT
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_NO_EFFECT_STMT
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_INDENTATION_PROBLEM
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_PEP8
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_ARGUMENTS_MISATCH
-     * @see org.python.pydev.ast.analysis.IAnalysisPreferences#TYPE_INVALID_ENCODING
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_DUPLICATED_SIGNATURE
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_NO_SELF
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_REIMPORT
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_UNDEFINED_VARIABLE
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_UNRESOLVED_IMPORT
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_UNUSED_IMPORT
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_UNUSED_VARIABLE
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_UNUSED_PARAMETER
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_UNUSED_WILD_IMPORT
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_USED_WILD_IMPORT
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_NO_EFFECT_STMT
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_INDENTATION_PROBLEM
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_PEP8
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_ARGUMENTS_MISATCH
+     * @see org.python.pydev.core.IAnalysisPreferences#TYPE_INVALID_ENCODING
      * 
      * @return this message type
      */

plugins/org.python.pydev.ast/src/org/python/pydev/ast/analysis/messages/Message.java

@@ -10,7 +10,7 @@
 package org.python.pydev.ast.analysis.messages;
 
 import org.eclipse.core.runtime.Assert;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IToken;
 
 public class Message extends AbstractMessage {

plugins/org.python.pydev/src/com/python/pydev/analysis/ctrl_1/IAnalysisMarkersParticipant.java → plugins/org.python.pydev.core/src/org/python/pydev/core/IAnalysisMarkersParticipant.java

@@ -7,17 +7,13 @@
 /*
  * Created on 24/09/2005
  */
-package com.python.pydev.analysis.ctrl_1;
+package org.python.pydev.core;
 
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.BadLocationException;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
-import org.python.pydev.core.IPyEdit;
-import org.python.pydev.core.IPythonNature;
 import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.editor.codefolding.MarkerAnnotationAndPosition;
 import org.python.pydev.shared_core.code_completion.ICompletionProposalHandle;
 
 public interface IAnalysisMarkersParticipant {
@@ -38,7 +34,7 @@ public interface IAnalysisMarkersParticipant {
      * @throws BadLocationException
      * @throws CoreException
      */
-    public abstract void addProps(MarkerAnnotationAndPosition marker, IAnalysisPreferences analysisPreferences,
+    public abstract void addProps(IMarkerInfoForAnalysis markerInfo, IAnalysisPreferences analysisPreferences,
             String line, PySelection ps, int offset, IPythonNature nature, IPyEdit edit,
             List<ICompletionProposalHandle> props)
             throws BadLocationException, CoreException;

plugins/org.python.pydev.ast/src/org/python/pydev/ast/analysis/IAnalysisPreferences.java → plugins/org.python.pydev.core/src/org/python/pydev/core/IAnalysisPreferences.java

@@ -7,7 +7,7 @@
 /*
  * Created on 24/07/2005
  */
-package org.python.pydev.ast.analysis;
+package org.python.pydev.core;
 
 import java.util.Set;
 

plugins/org.python.pydev.core/src/org/python/pydev/core/IMarkerInfoForAnalysis.java

@@ -0,0 +1,20 @@
+package org.python.pydev.core;
+
+public interface IMarkerInfoForAnalysis {
+
+    Object getPyLintMessageIdAttribute();
+
+    Integer getPyDevAnalisysType();
+
+    boolean hasPosition();
+
+    int getOffset();
+
+    int getLength();
+
+    void delete();
+
+    Object getFlake8MessageId();
+
+    Object getMessage();
+}

plugins/org.python.pydev.core/src/org/python/pydev/core/proposals/ICompletionProposalFactory.java

@@ -2,11 +2,11 @@
 
 import java.util.List;
 
-import org.eclipse.core.resources.IMarker;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateContext;
 import org.python.pydev.core.ICompletionRequest;
+import org.python.pydev.core.IMarkerInfoForAnalysis;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.IToken;
 import org.python.pydev.core.ShellId;
@@ -34,13 +34,13 @@ ICompletionProposalHandle createIgnorePyLintCompletionProposalInSameLine(
             String replacementString, int replacementOffset, int replacementLength, int cursorPosition,
             IImageHandle image, String displayString, Object contextInformation,
             String additionalProposalInfo, int priority, IPyEdit edit, String line, PySelection ps, FormatStd format,
-            IMarker marker);
+            IMarkerInfoForAnalysis marker);
 
     ICompletionProposalHandle createIgnoreFlake8CompletionProposalInSameLine(
             String replacementString, int replacementOffset, int replacementLength, int cursorPosition,
             IImageHandle image, String displayString, Object contextInformation,
             String additionalProposalInfo, int priority, IPyEdit edit, String line, PySelection ps, FormatStd format,
-            IMarker marker);
+            IMarkerInfoForAnalysis marker);
 
     ICompletionProposalHandle createPyTemplateProposal(Template template, TemplateContext context,
             IRegion region, IImageHandle image, int relevance);

plugins/org.python.pydev/src/com/python/pydev/analysis/ctrl_1/AbstractAnalysisMarkersParticipants.java

@@ -11,7 +11,8 @@
 import java.util.List;
 
 import org.eclipse.jface.text.BadLocationException;
-import org.python.pydev.ast.analysis.IAnalysisPreferences;
+import org.python.pydev.core.IAnalysisMarkersParticipant;
+import org.python.pydev.core.IAnalysisPreferences;
 import org.python.pydev.core.IAssistProps;
 import org.python.pydev.core.IPyEdit;
 import org.python.pydev.core.IPythonNature;
@@ -67,7 +68,8 @@ public List<ICompletionProposalHandle> getProps(PySelection ps, IImageCache imag
             for (MarkerAnnotationAndPosition marker : markersAtLine) {
                 for (IAnalysisMarkersParticipant participant : participants) {
                     try {
-                        participant.addProps(marker, analysisPreferences, currLine, ps, offset, nature, edit, props);
+                        participant.addProps(marker.asMarkerInfoForAnalysis(), analysisPreferences, currLine, ps,
+                                offset, nature, edit, props);
                     } catch (Exception e) {
                         Log.log("Error when getting proposals.", e);
                     }