MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-106091 Groovy: index access resolving in case of unresolved invoked expression

Browse Source
This commit is contained in:
Max Medvedev
2013-04-24 20:58:48 +04:00
parent 553e354981
commit c7a5dd9fa2
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
+7 -2
View File
@@ -72,7 +72,10 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
GrExpression selected = getInvokedExpression();
PsiType thisType = selected.getType();
if (thisType == null) return null;
if (thisType == null) {
thisType = TypesUtil.getJavaLangObject(this);
}
GrArgumentList argList = getArgumentList();
@@ -153,7 +156,9 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
GrExpression invoked = getInvokedExpression();
PsiType thisType = invoked.getType();
if (thisType == null) return GroovyResolveResult.EMPTY_ARRAY;
if (thisType == null) {
thisType = TypesUtil.getJavaLangObject(this);
}
GrArgumentList argList = getArgumentList();
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
+2 -2
View File
@@ -570,7 +570,7 @@ print i<warning descr="'getAt' in 'X' cannot be applied to '(java.lang.String, j
void testArrayAccess5() {
testHighlighting('''\
print a<warning descr="Cannot resolve index access with arguments (java.lang.Integer)">[1]</warning>
print a<warning descr="'getAt' in 'org.codehaus.groovy.runtime.DefaultGroovyMethods' cannot be applied to '(java.lang.Integer, java.lang.Integer)'">[1, 2]</warning>
''')
}
@@ -632,7 +632,7 @@ i<warning descr="'putAt' in 'X' cannot be applied to '(java.lang.String, java.la
void testArrayAccess10() {
testHighlighting('''\
a<warning descr="Cannot resolve index access with arguments (java.lang.Integer, java.lang.Integer)">[1]</warning> = 2
a<warning descr="'putAt' in 'org.codehaus.groovy.runtime.DefaultGroovyMethods' cannot be applied to '(java.lang.Integer, java.lang.Integer, java.lang.Integer)'">[1, 3]</warning> = 2
''')
}
plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/unresolvedArrayAccess.java
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
java.lang.Object foo;
print(foo.getAt(1));
print(org.codehaus.groovy.runtime.DefaultGroovyMethods.getAt(foo, 1));