Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
d2bfe3d1
Commit
d2bfe3d1
authored
7 years ago
by
Anna.Kozlova
Browse files
Options
Download
Email Patches
Plain Diff
ensure name when retrieving constructors from a class (IDEA-188068)
parent
a43d6320
Branches unavailable
Tags unavailable
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+1
-1
.../java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+2
-2
...i-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterAlreadyAssigned.java
+1
-1
...teConstructorParameterFromField/afterAlreadyAssigned.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/beforeAlreadyAssigned.java
+1
-1
...eConstructorParameterFromField/beforeAlreadyAssigned.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterIncompleteConstructor.java
+1
-1
...zeFinalFieldInConstructor/afterIncompleteConstructor.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterMultipleInvoke.java
+1
-1
...nitializeFinalFieldInConstructor/afterMultipleInvoke.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterParamWithSameName.java
+1
-1
...ializeFinalFieldInConstructor/afterParamWithSameName.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterSimpleInvoke.java
+1
-1
.../initializeFinalFieldInConstructor/afterSimpleInvoke.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeIncompleteConstructor.java
+1
-1
...eFinalFieldInConstructor/beforeIncompleteConstructor.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeMultipleInvoke.java
+1
-1
...itializeFinalFieldInConstructor/beforeMultipleInvoke.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeParamWithSameName.java
+1
-1
...alizeFinalFieldInConstructor/beforeParamWithSameName.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeSimpleInvoke.java
+1
-1
...initializeFinalFieldInConstructor/beforeSimpleInvoke.java
with
13 additions
and
13 deletions
+13
-13
java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+
1
-
1
View file @
d2bfe3d1
...
@@ -70,7 +70,7 @@ public class PsiImplUtil {
...
@@ -70,7 +70,7 @@ public class PsiImplUtil {
public
static
PsiMethod
[]
getConstructors
(
@NotNull
PsiClass
aClass
)
{
public
static
PsiMethod
[]
getConstructors
(
@NotNull
PsiClass
aClass
)
{
List
<
PsiMethod
>
result
=
null
;
List
<
PsiMethod
>
result
=
null
;
for
(
PsiMethod
method
:
aClass
.
getMethods
())
{
for
(
PsiMethod
method
:
aClass
.
getMethods
())
{
if
(
method
.
isConstructor
())
{
if
(
method
.
isConstructor
()
&&
method
.
getName
().
equals
(
aClass
.
getName
())
)
{
if
(
result
==
null
)
result
=
ContainerUtil
.
newSmartList
();
if
(
result
==
null
)
result
=
ContainerUtil
.
newSmartList
();
result
.
add
(
method
);
result
.
add
(
method
);
}
}
...
...
This diff is collapsed.
Click to expand it.
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+
2
-
2
View file @
d2bfe3d1
...
@@ -503,8 +503,8 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
...
@@ -503,8 +503,8 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
}
}
// rename constructors
// rename constructors
for
(
PsiMethod
method
:
get
Constructor
s
())
{
for
(
PsiMethod
method
:
get
Method
s
())
{
if
(
method
.
getName
().
equals
(
oldName
))
{
if
(
method
.
isConstructor
()
&&
method
.
getName
().
equals
(
oldName
))
{
method
.
setName
(
newName
);
method
.
setName
(
newName
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterAlreadyAssigned.java
+
1
-
1
View file @
d2bfe3d1
// "Add constructor parameter" "true"
// "Add constructor parameter" "true"
class
A
{
class
Foo
{
private
final
String
text
;
private
final
String
text
;
public
Foo
(
String
text
)
{
public
Foo
(
String
text
)
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/beforeAlreadyAssigned.java
+
1
-
1
View file @
d2bfe3d1
// "Add constructor parameter" "true"
// "Add constructor parameter" "true"
class
A
{
class
Foo
{
private
final
String
te
<
caret
>
xt
;
private
final
String
te
<
caret
>
xt
;
public
Foo
(
String
text
)
{
public
Foo
(
String
text
)
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterIncompleteConstructor.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
var
;
private
final
int
var
;
private
Main
()
{
private
Main
()
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterMultipleInvoke.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
var
;
private
final
int
var
;
private
Main
()
{
private
Main
()
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterParamWithSameName.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
var
;
private
final
int
var
;
private
Main
(
int
var
)
{
private
Main
(
int
var
)
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/afterSimpleInvoke.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
var
;
private
final
int
var
;
private
Main
()
{
private
Main
()
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeIncompleteConstructor.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
v
<
caret
>
ar
;
private
final
int
v
<
caret
>
ar
;
private
Main
()
private
Main
()
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeMultipleInvoke.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
v
<
caret
>
ar
;
private
final
int
v
<
caret
>
ar
;
private
Main
()
{
private
Main
()
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeParamWithSameName.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
v
<
caret
>
ar
;
private
final
int
v
<
caret
>
ar
;
private
Main
(
int
var
)
{
private
Main
(
int
var
)
{
...
...
This diff is collapsed.
Click to expand it.
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/initializeFinalFieldInConstructor/beforeSimpleInvoke.java
+
1
-
1
View file @
d2bfe3d1
// "Initialize in constructor" "true"
// "Initialize in constructor" "true"
class
A
{
class
Main
{
private
final
int
v
<
caret
>
ar
;
private
final
int
v
<
caret
>
ar
;
private
Main
()
{
private
Main
()
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help