Changeset 3382 for devel-tools/trunk

Timestamp:

Feb 6, 2008, 6:09:19 PM (13 years ago)

Author:

yura

Message:

• Update style ranges when preference store is changed.

Location:

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor

Files:

• PresentationVisitor.java (modified) (3 diffs)
• RfpEditor.java (modified) (4 diffs)
• RfpReconcilingStrategy.java (modified) (4 diffs)
• RfpSourceViewerConfiguration.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/PresentationVisitor.java

@@ -8 +8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
+import org.refal.plus.rfpdt.comp.RfpResource;
 import org.refal.plus.rfpdt.comp.SrcPosition;
 import org.refal.plus.rfpdt.comp.ast.AstAlt;
@@ -52 +53 @@
 public class PresentationVisitor implements ProgramVisitor, SentenceVisitor, ExpVisitor {
     public static class StylePosition extends Position {
-        private final TextAttribute textAttribute;
-
-        public StylePosition (SrcPosition pos, TextAttribute textAttribute) {
+        private final String key;
+        private TextAttribute textAttribute = null;
+
+        public StylePosition (SrcPosition pos, String key) {
             super(pos.charStart, pos.charEnd - pos.charStart);
-            this.textAttribute = textAttribute;
+            this.key = key;
         }
 
+        public void updateStyleRange (IPreferenceStore store) {
+            textAttribute = ColorScanner.getTextAttribute(store, key);
+        }
+
         public StyleRange getStyleRange () {
-            StyleRange range = new StyleRange(offset, length, textAttribute.getForeground(), textAttribute
-                    .getBackground());
+            StyleRange styleRange = new StyleRange(offset, length, textAttribute.getForeground(), textAttribute.getBackground());
             int style = textAttribute.getStyle();
-            range.fontStyle = style & (SWT.BOLD | SWT.ITALIC);
-            range.strikeout = (style & TextAttribute.STRIKETHROUGH) == TextAttribute.STRIKETHROUGH;
-            range.underline = (style & TextAttribute.UNDERLINE) == TextAttribute.STRIKETHROUGH;
-            return range;
+            styleRange.fontStyle = style & (SWT.BOLD | SWT.ITALIC);
+            styleRange.strikeout = (style & TextAttribute.STRIKETHROUGH) == TextAttribute.STRIKETHROUGH;
+            styleRange.underline = (style & TextAttribute.UNDERLINE) == TextAttribute.STRIKETHROUGH;
+            return styleRange;
         }
     }
 
-    public static StylePosition[] updateTextPresentation (AstImplem astImplem, IPreferenceStore store) {
-        PresentationVisitor presentationVisitor = new PresentationVisitor(store);
+    public static StylePosition[] updateTextPresentation (AstImplem astImplem) {
+        PresentationVisitor presentationVisitor = new PresentationVisitor(astImplem.pos.rfpResource);
         astImplem.accept(presentationVisitor);
         return presentationVisitor.styleRangeList.toArray(new StylePosition[presentationVisitor.styleRangeList.size()]);
@@ -77 +82 @@
 
     private final ArrayList<StylePosition> styleRangeList;
-    private final IPreferenceStore store;
-
-    private void addAstNameStype (AstNode name, String key) {
-        if (name == null || name.pos.rfpResource.isInterface) // TODO - must be RfpResource
+    private final RfpResource rfpResource;
+
+    private void addAstNameStyle (AstNode name, String key) {
+        if (! rfpResource.equals(name.pos.rfpResource))
             return;
-        styleRangeList.add(new StylePosition(name.pos, ColorScanner.getTextAttribute(store, key)));
-    }
-
-    private PresentationVisitor (IPreferenceStore store) {
+        styleRangeList.add(new StylePosition(name.pos, key));
+    }
+
+    private PresentationVisitor (RfpResource rfpResource) {
         this.styleRangeList = new ArrayList<StylePosition>();
-        this.store = store;
+        this.rfpResource = rfpResource;
     }
 
     private void visitObjectDefinition (AstName name) {
-        addAstNameStype(name, IColorPreferences.IDENTIFIER_DEFINITION);
+        if (name != null)
+            addAstNameStyle(name, IColorPreferences.IDENTIFIER_DEFINITION);
     }
 
     private void visitObjectUse (AstName name) {
         if (name != null && name.identifier.length() < name.pos.charEnd - name.pos.charStart)
-            addAstNameStype(name, IColorPreferences.IDENTIFIER_USE);
+            addAstNameStyle(name, IColorPreferences.IDENTIFIER_USE);
     }
 
     private void visitVariableDefinition (AstName name) {
-        addAstNameStype(name, IColorPreferences.VARIABLE_DEFINITION);
+        if (name != null)
+            addAstNameStyle(name, IColorPreferences.VARIABLE_DEFINITION);
     }
 
     private void visitVariableUse (AstName name) {
-        // addAstNameStype(name, IColorPreferences.VARIABLE_USE);
+    // addAstNameStype(name, IColorPreferences.VARIABLE_USE);
     }
 
     private void visitSymbol (AstWordSymbol astWordSymbol) {
         if (astWordSymbol.word.length() == astWordSymbol.pos.charEnd - astWordSymbol.pos.charStart)
-            addAstNameStype(astWordSymbol, IColorPreferences.SYMBOL);
+            addAstNameStyle(astWordSymbol, IColorPreferences.SYMBOL);
     }
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpEditor.java

@@ -145 +145 @@
     private IPropertyChangeListener propertyChangeListener;
     private RfpSourceViewerConfiguration rfpSourceViewerConfiguration;
+    private  IPreferenceStore store;
 
     RfpReconcilingStrategy rfpReconcilingStrategy = null;
@@ -167 +168 @@
         stores.add(RfpEditorPlugin.getPluginPreferenceStore());
         stores.add(EditorsUI.getPreferenceStore());
-        IPreferenceStore store = new ChainedPreferenceStore(stores.toArray(new IPreferenceStore[stores.size()]));
+        store = new ChainedPreferenceStore(stores.toArray(new IPreferenceStore[stores.size()]));
         setPreferenceStore(store);
 
@@ -177 +178 @@
         propertyChangeListener = new IPropertyChangeListener() {
             public void propertyChange (PropertyChangeEvent event) {
+                for (StylePosition position : stylePositionList)
+                    position.updateStyleRange(store);
                 redrawTextAsync();
             }
@@ -187 +190 @@
     public void changeTextPresentation (IDocument document, StylePosition[] stylePositionList) {
         if (this.stylePositionList != null)
-            for (Position position : stylePositionList)
+            for (Position position : this.stylePositionList)
                 document.removePosition(position);
+        for (StylePosition position : stylePositionList)
+            position.updateStyleRange(store);
         this.stylePositionList = stylePositionList;
         if (this.stylePositionList != null)
-            for (Position position : stylePositionList)
+            for (StylePosition position : this.stylePositionList)
                 try {
                     document.addPosition(position);

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpReconcilingStrategy.java

@@ -2 +2 @@
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.DocumentEvent;
 import org.eclipse.jface.text.IDocument;
@@ -14 +13 @@
 public class RfpReconcilingStrategy implements IReconcilingStrategy, IDocumentListener {
     private final RfpEditor editor;
-    private final IPreferenceStore store;
     private IDocument document = null;
     private AstImplem astImplem = null;
@@ -29 +27 @@
     }
 
-    public RfpReconcilingStrategy (RfpEditor editor, IPreferenceStore store) {
+    public RfpReconcilingStrategy (RfpEditor editor) {
         this.editor = editor;
-        this.store = store;
         editor.rfpReconcilingStrategy = this;
     }
@@ -44 +41 @@
         updateAstImplem();
         if (astImplem != null)
-            editor.changeTextPresentation(document, PresentationVisitor.updateTextPresentation(astImplem, store));
+            editor.changeTextPresentation(document, PresentationVisitor.updateTextPresentation(astImplem));
     }
 

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.editor/src/org/refal/plus/rfpdt/editor/RfpSourceViewerConfiguration.java

@@ -81 +81 @@
     public IReconciler getReconciler (ISourceViewer sourceViewer) {
         if (editor != null && editor.isEditable())
-            return new MonoReconciler(new RfpReconcilingStrategy(editor, fPreferenceStore), false);
+            return new MonoReconciler(new RfpReconcilingStrategy(editor), false);
         return null;
     }