Changeset 4067 for devel-tools

Timestamp:

Feb 5, 2009, 3:49:17 PM (12 years ago)

Author:

yura

Message:

• Different error messages in GotoMatchingBracketAction?.

Location:

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt

Files:

• editor/BracketMatcher.java (modified) (3 diffs)
• editor/RfpEditorMessages.java (modified) (1 diff)
• editor/RfpEditorMessages.properties (modified) (1 diff)
• ui/actions/GotoMatchingBracketAction.java (modified) (2 diffs)
• ui/actions/OpenDeclarationAction.java (modified) (1 diff)

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/BracketMatcher.java

@@ -1 @@
-/**
- * 
- */
 package org.refal.rfpdt.editor;
 
@@ -12 +9 @@
 public class BracketMatcher implements ICharacterPairMatcher {
     private int fAnchor = -1;
+    
+    public static boolean isBracket (IDocument doc, int offset) {
+        if (doc == null || offset < 0 || offset > doc.getLength())
+            return false;
+        try {
+            offset = Math.max(offset - 1, 0);
+            char prevChar = doc.getChar(offset);
+            return Document.isOpen(prevChar) || Document.isClose(prevChar);
+        } catch (BadLocationException ble) {
+            return false;
+        }
+    }
 
     public IRegion match (IDocument doc, int offset) {
@@ -43 +52 @@
         fAnchor = -1;
     }
-
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpEditorMessages.java

@@ -22 +22 @@
     }
 
-    public static String GotoMatchingBracket_error_invalidSelection;
-    public static String GotoMatchingBracket_error_noMatchingBracket;
+    public static String GotoMatchingBracketAction_error_invalidSelection;
+    public static String GotoMatchingBracketAction_error_noMatchingBracket;
 
-    public static String OpenDeclaration_error_invalidSelection;
+    public static String OpenDeclarationAction_error_invalidSelection;
 }

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/editor/RfpEditorMessages.properties

@@ -1 @@
-GotoMatchingBracket_error_invalidSelection = No bracket selected
-GotoMatchingBracket_error_noMatchingBracket = No matching bracket found
+GotoMatchingBracketAction_error_invalidSelection = No bracket selected
+GotoMatchingBracketAction_error_noMatchingBracket = No matching bracket found
 
-OpenDeclaration_error_invalidSelection = Current selection doesn't resolve to Refal element
+OpenDeclarationAction_error_invalidSelection = Current selection doesn't resolve to Refal element

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/GotoMatchingBracketAction.java

@@ -6 +6 @@
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.swt.custom.StyledText;
+import org.refal.rfpdt.editor.BracketMatcher;
 import org.refal.rfpdt.editor.RfpEditorMessages;
 
 public class GotoMatchingBracketAction extends RfpEditorActionDelegate {
     public void run () {
-        /*
-         * TODO: Keep (extend and shrink as necessary) current selection while jumping to matching bracket.
-         */
+        // TODO: Keep (extend and shrink as necessary) current selection while jumping to matching bracket.
         ISourceViewer sourceViewer = editor.sourceViewer();
         IDocument document = sourceViewer.getDocument();
@@ -18 +17 @@
             return;
         StyledText text = sourceViewer.getTextWidget();
-        IRegion region = editor.getBracketMatcher().match(document, editor.widgetOffset2ModelOffset(text.getCaretOffset()));
-        if (region == null) { // FIXME: sometimes another error is needed (GotoMatchingBracket_error_invalidSelection)
-            editor.statusLineErrorMessage(RfpEditorMessages.GotoMatchingBracket_error_noMatchingBracket);
+        int modelOffset = editor.widgetOffset2ModelOffset(text.getCaretOffset());
+        if (!BracketMatcher.isBracket(document, modelOffset)) {
+            editor.statusLineErrorMessage(RfpEditorMessages.GotoMatchingBracketAction_error_invalidSelection);
+            text.getDisplay().beep();
+            return;
+        }
+        IRegion region = editor.getBracketMatcher().match(document, modelOffset);
+        if (region == null) {
+            editor.statusLineErrorMessage(RfpEditorMessages.GotoMatchingBracketAction_error_noMatchingBracket);
             text.getDisplay().beep();
             return;

devel-tools/trunk/eclipse/org.refal.rfpdt.ui/src/org/refal/rfpdt/ui/actions/OpenDeclarationAction.java

@@ -17 +17 @@
         AstNode astNode = editor.astInfo.getDeclaration(getSelection().getOffset());
         if (astNode == null) {
-            editor.statusLineErrorMessage(RfpEditorMessages.OpenDeclaration_error_invalidSelection);
+            editor.statusLineErrorMessage(RfpEditorMessages.OpenDeclarationAction_error_invalidSelection);
             sourceViewer.getTextWidget().getDisplay().beep();
             return;