You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/08/19 17:30:58 UTC
svn commit: r1515470 - in /uima/sandbox/ruta/trunk/ruta-ep-ide/src/main:
antlr3/org/apache/uima/ruta/ide/core/parser/
java/org/apache/uima/ruta/ide/core/codeassist/
java/org/apache/uima/ruta/ide/parser/ast/
Author: pkluegl
Date: Mon Aug 19 15:30:57 2013
New Revision: 1515470
URL: http://svn.apache.org/r1515470
Log:
UIMA-2428
- some improvements for auto completion
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1515470&r1=1515469&r2=1515470&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g Mon Aug 19 15:30:57 2013
@@ -577,8 +577,10 @@ simpleStatement returns [RutaRule stmt =
(regexpRule)=> rer = regexpRule {stmt = rer;}
|
elements=ruleElementsRoot
+ {stmt = scriptFactory.createRule(elements, null);}
s = SEMI
- {stmt = scriptFactory.createRule(elements, s);}
+ {stmt = scriptFactory.createRule(elements, s);}
+
;
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java?rev=1515470&r1=1515469&r2=1515470&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java Mon Aug 19 15:30:57 2013
@@ -129,8 +129,8 @@ public class RutaCompletionEngine extend
try {
Collection<String> dependencies = new ArrayList<String>();
// TODO UIMA-3077
-// Collection<String> dependencies = RutaLaunchConfigurationDelegate
-// .getClassPath(scriptProject);
+ // Collection<String> dependencies = RutaLaunchConfigurationDelegate
+ // .getClassPath(scriptProject);
URL[] urls = new URL[dependencies.size()];
int counter = 0;
for (String dep : dependencies) {
@@ -138,8 +138,8 @@ public class RutaCompletionEngine extend
counter++;
}
classloader = new URLClassLoader(urls);
-// } catch (CoreException e) {
-// RutaIdeCorePlugin.error(e);
+ // } catch (CoreException e) {
+ // RutaIdeCorePlugin.error(e);
} catch (MalformedURLException e) {
RutaIdeCorePlugin.error(e);
}
@@ -155,6 +155,7 @@ public class RutaCompletionEngine extend
if (node == null) {
doCompletionOnEmptyStatement(module, position, i);
doCompletionOnDeclaration(module, startPart);
+ doCompletionOnVarRef(module, parsed, startPart, RutaTypeConstants.RUTA_TYPE_AT, "");
} else if (node instanceof RutaVariableReference) {
int type = ((RutaVariableReference) node).getType();
doCompletionOnVarRef(module, parsed, startPart, type,
@@ -170,9 +171,11 @@ public class RutaCompletionEngine extend
((ComponentReference) node).getType(), startPart);
} else if (node instanceof RutaAction) {
doCompletionOnAction(module, parsed, startPart, RutaTypeConstants.RUTA_TYPE_A, startPart);
+ doCompletionOnVarRef(module, parsed, startPart, RutaTypeConstants.RUTA_TYPE_AT, "");
} else if (node instanceof RutaCondition) {
doCompletionOnCondition(module, parsed, startPart, RutaTypeConstants.RUTA_TYPE_C,
startPart);
+ doCompletionOnVarRef(module, parsed, startPart, RutaTypeConstants.RUTA_TYPE_AT, "");
}
// if(requestor.)
// doCompletionOnKeyword(position, i, startPart);
@@ -510,7 +513,6 @@ public class RutaCompletionEngine extend
@SuppressWarnings({ "unchecked" })
private void doCompletionOnEmptyStatement(IModuleSource cu, int position, int i) {
int kind = CompletionProposal.LOCAL_VARIABLE_REF;
- // doCompletionOnKeyword(position, i, "");
if (!super.requestor.isIgnored(kind)) {
suggestFields(cu);
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java?rev=1515470&r1=1515469&r2=1515470&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ActionFactory.java Mon Aug 19 15:30:57 2013
@@ -69,8 +69,8 @@ public class ActionFactory extends Abstr
public static RutaAction createEmptyAction(Token token) {
int bounds[] = getBounds(token);
- return new RutaAction(bounds[0], bounds[0], new ArrayList<Expression>(),
- RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[0]);
+ return new RutaAction(bounds[0], bounds[1], new ArrayList<Expression>(),
+ RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[1]);
}
public static RutaAction createAction(Token type, Map<Expression, Expression> map,
@@ -247,7 +247,7 @@ public class ActionFactory extends Abstr
}
int[] bounds = getBounds(exprL.get(0), exprL.get(exprL.size() - 1));
return new RutaAction(bounds[0], bounds[1], exprL, ExpressionConstants.USER_EXPRESSION_START,
- IMPLICIT, bounds[0], bounds[0]);
+ IMPLICIT, bounds[0], bounds[1]);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java?rev=1515470&r1=1515469&r2=1515470&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionFactory.java Mon Aug 19 15:30:57 2013
@@ -59,7 +59,7 @@ public class ConditionFactory extends Ab
}
int[] bounds = getBounds(exprL.get(0), exprL.get(exprL.size() - 1));
return new RutaCondition(bounds[0], bounds[1], exprL, RutaConditionConstants.CONSTANT_OFFSET,
- IMPLICIT, bounds[0], bounds[0]);
+ IMPLICIT, bounds[0], bounds[1]);
}
public static RutaCondition createCondition(Token type, Expression... exprsArray) {
@@ -77,8 +77,8 @@ public class ConditionFactory extends Ab
public static RutaCondition createEmptyCondition(Token token) {
int bounds[] = getBounds(token);
- return new RutaCondition(bounds[0], bounds[0], new ArrayList<Expression>(),
- RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[0]);
+ return new RutaCondition(bounds[0], bounds[1], new ArrayList<Expression>(),
+ RutaConditionConstants.CONSTANT_OFFSET, "", bounds[0], bounds[1]);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java?rev=1515470&r1=1515469&r2=1515470&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.java Mon Aug 19 15:30:57 2013
@@ -116,22 +116,22 @@ public class ExpressionFactory extends A
public static Expression createEmptyTypeExpression(Token token) {
int bounds[] = getBounds(token);
- return new RutaVariableReference(bounds[0], bounds[0], "", RutaTypeConstants.RUTA_TYPE_AT);
+ return new RutaVariableReference(bounds[0], bounds[1], "", RutaTypeConstants.RUTA_TYPE_AT);
}
public static Expression createEmptyStringExpression(Token token) {
int bounds[] = getBounds(token);
- return new RutaVariableReference(bounds[0], bounds[0], "", RutaTypeConstants.RUTA_TYPE_S);
+ return new RutaVariableReference(bounds[0], bounds[1], "", RutaTypeConstants.RUTA_TYPE_S);
}
public static Expression createEmptyNumberExpression(Token token) {
int bounds[] = getBounds(token);
- return new RutaVariableReference(bounds[0], bounds[0], "", RutaTypeConstants.RUTA_TYPE_N);
+ return new RutaVariableReference(bounds[0], bounds[1], "", RutaTypeConstants.RUTA_TYPE_N);
}
public static Expression createEmptyBooleanExpression(Token token) {
int bounds[] = getBounds(token);
- return new RutaVariableReference(bounds[0], bounds[0], "", RutaTypeConstants.RUTA_TYPE_B);
+ return new RutaVariableReference(bounds[0], bounds[1], "", RutaTypeConstants.RUTA_TYPE_B);
}
// public static Expression createSimpleTypeExpression(Token at, RutaBlock env) {