[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2230] trunk

[<caw...@us...>]

Revision: 2230
          http://svn.sourceforge.net/rubyeclipse/?rev=2230&view=rev
Author:   cawilliams
Date:     2007-03-26 10:33:01 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyDocumentProvider.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java	2007-03-26 15:28:48 UTC (rev 2229)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java	2007-03-26 17:33:01 UTC (rev 2230)
@@ -16,11 +16,11 @@
 import org.rubypeople.rdt.core.RubyCore;
 import org.rubypeople.rdt.core.RubyModelException;
 import org.rubypeople.rdt.core.compiler.CategorizedProblem;
+import org.rubypeople.rdt.internal.core.parser.Error;
 import org.rubypeople.rdt.internal.core.parser.RdtWarnings;
 import org.rubypeople.rdt.internal.core.parser.RubyParser;
 import org.rubypeople.rdt.internal.core.parser.TaskParser;
 import org.rubypeople.rdt.internal.core.parser.TaskTag;
-import org.rubypeople.rdt.internal.core.parser.Warning;
 import org.rubypeople.rdt.internal.core.parser.warnings.DelegatingVisitor;
 import org.rubypeople.rdt.internal.core.parser.warnings.RubyLintVisitor;
 
@@ -55,8 +55,9 @@
             node.accept(visitor);
             return visitor.getProblems();
         } catch (SyntaxException e) {
-        	// Eat the exception
-//            problemRequestor.acceptProblem(new Error(e.getPosition(), e.getMessage()));
+        	List<CategorizedProblem> list = new ArrayList<CategorizedProblem>();
+        	list.add(new Error(e.getPosition(), e.getMessage()));
+        	return list;
         } catch (RubyModelException e) {
 			RubyCore.log(e);
 		}

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java	2007-03-26 15:28:48 UTC (rev 2229)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/RubyCodeAnalyzer.java	2007-03-26 17:33:01 UTC (rev 2230)
@@ -25,6 +25,7 @@
 import org.jruby.ast.visitor.NodeVisitor;
 import org.jruby.lexer.yacc.SyntaxException;
 import org.rubypeople.rdt.core.RubyCore;
+import org.rubypeople.rdt.internal.core.parser.Error;
 import org.rubypeople.rdt.internal.core.parser.ImmediateWarnings;
 import org.rubypeople.rdt.internal.core.parser.RubyParser;
 import org.rubypeople.rdt.internal.core.parser.warnings.DelegatingVisitor;
@@ -63,8 +64,7 @@
             rootNode.accept(visitor);
             indexUpdater.update(file, rootNode, true);
         } catch (SyntaxException e) {
-            // Should we really put a marker here? I think the normal parsing process will create syntax markers just fine
-            markerManager.createSyntaxError(file, e);
+        	markerManager.addProblem(file, new Error(e.getPosition(), e.getMessage()));
         } finally {
             IoUtils.closeQuietly(reader);
         }

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyDocumentProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyDocumentProvider.java	2007-03-26 15:28:48 UTC (rev 2229)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyDocumentProvider.java	2007-03-26 17:33:01 UTC (rev 2230)
@@ -870,6 +870,7 @@
 		 * Signals the end of problem reporting.
 		 */
 		private void reportProblems(List reportedProblems) {
+			// FIXME Find a way to not add annotations for problems which are duplicates of markers on the underlying file!
 			if (fProgressMonitor != null && fProgressMonitor.isCanceled())
 				return;
 				


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.