Changeset 66 in default for v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui

Timestamp:

05/14/14 10:07:49 (10 years ago)

Author:

hkaulbersch

Message:

Changed Validation:
Validation now works between different files
-unused rule
-referenced only ones
-passthrough

Location:

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui

Files:

• outline/EbnfOutlineTreeProvider.xtend (modified) (1 diff)
• quickfix/EbnfQuickfixProvider.xtend (modified) (2 diffs)

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/outline/EbnfOutlineTreeProvider.xtend

@@ -10 +10 @@
  */
 class EbnfOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {
-        
+        
 }

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/quickfix/EbnfQuickfixProvider.xtend

@@ -20 +20 @@
 import de.ugoe.cs.swe.bnftools.ebnf.EtsiBnf
 import java.util.ArrayList
+import org.eclipse.xtext.EcoreUtil2
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry
+import org.eclipse.emf.ecore.util.EcoreUtil
+import org.eclipse.emf.common.util.EList
+import org.eclipse.xtext.resource.IResourceDescriptions
+import com.google.inject.Inject
+import de.ugoe.cs.swe.bnftools.ebnf.DefinitionList
+import de.ugoe.cs.swe.bnftools.ebnf.SingleDefinition
+import de.ugoe.cs.swe.bnftools.ebnf.util.EbnfAdapterFactory
 
 /**
@@ -28 +37 @@
 class EbnfQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {
 
+        @Inject
+        IResourceDescriptions resourceDescriptions;
+
         //*****************************************************************************************
-        //works
-        @Fix(EbnfValidator.ruleReferencedOneDescription)
-        def void fixInlineRuleReferencedOnce(Issue issue, IssueResolutionAcceptor acceptor) {
-                acceptor.accept(
-                        issue,
-                        "Inline the rule",
-                        "Delete the rule and replace its single reference by the rule's right side",
-                        "upcase.png"
-                ) [ element, context |
-                        var Rule rule = element as Rule;
-                        
-                        var IXtextDocument xtextDocument = context.getXtextDocument();
-                        var ICompositeNode node = NodeModelUtils.findActualNodeFor(rule);
-                        var String nodeText = node.text;
-                        var int textLength = nodeText.length - 2;
-                        var int offset = node.textRegion.offset;
-                        //rename references
-                        var ICompositeNode dList = NodeModelUtils.findActualNodeFor(rule.definitionList);
-                        var String refText = "(" + dList.text + ")";
-                        var int refLength = rule.name.length;
-                        var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
-                        //is the reference in the rule itself?
-                        var boolean foundRule = false;
-                        var EObject r = references.get(0) as EObject;
-                        var Rule containingRule = null;
-                        while (!foundRule) {
-                                r = r.eContainer;
-                                if (r instanceof Rule) {
-                                        containingRule = r as Rule;
-                                        foundRule = true;
-                                }
-                        }
-                        if (!rule.equals(containingRule)) {
-                                for (ruleRef : references) {
-                                        var ICompositeNode refNode = NodeModelUtils.findActualNodeFor(ruleRef);
-                                        var int refOffset = refNode.textRegion.offset;
-
-                                        xtextDocument.replace(refOffset, refLength, refText);
-                                        if (refOffset < offset) {
-                                                offset += refText.length - refLength;
+        //works but only in one file
+                @Fix(EbnfValidator.ruleReferencedOneDescription)
+                def void fixInlineRuleReferencedOnce(Issue issue, IssueResolutionAcceptor acceptor) {
+                        acceptor.accept(
+                                issue,
+                                "Inline the rule",
+                                "Delete the rule and replace its single reference by the rule's right side",
+                                "upcase.png"
+                        ) [ element, context |
+                                var Rule rule = element as Rule;
+                                var IXtextDocument xtextDocument = context.getXtextDocument();
+                                var ICompositeNode node = NodeModelUtils.findActualNodeFor(rule);
+                                var String nodeText = node.text;
+                                var int textLength = nodeText.length - 2;
+                                var int offset = node.textRegion.offset;
+                                //rename references
+                                var ICompositeNode dList = NodeModelUtils.findActualNodeFor(rule.definitionList);
+                                var String refText = "(" + dList.text + ")";
+                                var int refLength = rule.name.length;
+                                var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
+                                //*********************************
+                                //is the reference in the rule itself?
+                                var boolean foundRule = false;
+                                var EObject r = references.get(0) as EObject;
+                                var Rule containingRule = null;
+                                while (!foundRule) {
+                                        r = r.eContainer;
+                                        if (r instanceof Rule) {
+                                                containingRule = r as Rule;
+                                                foundRule = true;
                                         }
                                 }
-                        }
-                        // delete rule
-                        xtextDocument.replace(offset, textLength, "");
-                ]
-
-        }
+                                if (!rule.equals(containingRule)) {
+        
+                                                                        for (ruleRef : references) {
+                                                                                var ICompositeNode refNode = NodeModelUtils.findActualNodeFor(ruleRef);
+                                                                                var int refOffset = refNode.textRegion.offset;
+                                        
+                                                                                xtextDocument.replace(refOffset, refLength, refText);
+                                                                                if (refOffset < offset) {
+                                                                                        offset += refText.length - refLength;
+                                                                                }
+                                                                        }
+                                                                        
+                                // delete rule
+                                }
+                                
+                                xtextDocument.replace(offset, textLength, "");
+                        ]
+        
+                }
+        
+//      // this is not working by unknown reasons 
+//      @Fix(EbnfValidator.ruleReferencedOneDescription)
+//      def void fixInlineRuleReferencedOnce(Issue issue, IssueResolutionAcceptor acceptor) {
+//              acceptor.accept(
+//                      issue,
+//                      "Inline the rule",
+//                      "Delete the rule and replace its single reference by the rule's right side",
+//                      "upcase.png"
+//              ) [ element, context |
+//                      var Rule rule = element as Rule;
+//                      var DefinitionList dlist = rule.definitionList;
+//                      var List<Rule> rules=EbnfAnalysisUtils.getAllRules(rule.eContainer().eContainer() as EtsiBnf);
+//                      var SingleDefinition sDef = rules.get(1).definitionList.singleDefinition.get(1);
+//                      dlist.singleDefinition.add(sDef);
+//                      rule.name="bla";
+//              ]
+//
+//      }
 
         //*****************************************************************************************
-        
         //              @Fix(EbnfValidator.passthroughRuleDescription)
         //      def void fixRemovePassthroughRule(Issue issue, IssueResolutionAcceptor acceptor) {