Move to struct init intention: handle struct declaration case#2816
Closed
wbars wants to merge 1 commit into
Closed
Move to struct init intention: handle struct declaration case#2816wbars wants to merge 1 commit into
wbars wants to merge 1 commit into
Conversation
wbars
changed the title
ibrque
reviewed
Nov 1, 2016
| @NotNull | ||
| public static GoCompositeLit createCompositeLit(@NotNull Project project, @NotNull GoType type) { | ||
| String typeText = type.getText(); | ||
| GoFile file = createFileFromText(project, "package a; struct " + typeText + " {}; var _ = " + typeText + "{}"); |
Contributor
There was a problem hiding this comment.
Why you need this : struct " + typeText + " {}; ?
| if (previousStatement instanceof GoAssignmentStatement) { | ||
| return getStructLiteral(fieldReferenceExpression, (GoAssignmentStatement)previousStatement); | ||
| } | ||
| if (previousStatement instanceof GoStatementImpl) { |
Contributor
There was a problem hiding this comment.
Use GoStatement interface instead GoStatementImpl
| if (varSpec == null) return null; | ||
| GoType structType = isUnassigned(varSpec) ? definition.getGoType(null) : null; | ||
| return structType != null | ||
| ? GoElementFactory.createCompositeLit(project, structType) |
Contributor
There was a problem hiding this comment.
You can take project from statement
| if (varSpec == null) return null; | ||
| GoType structType = isUnassigned(varSpec) ? definition.getGoType(null) : null; | ||
| return structType != null | ||
| ? GoElementFactory.createCompositeLit(project, structType) |
Contributor
There was a problem hiding this comment.
You can take project from statement
| List<GoVarSpec> varSpecs = declaration != null ? declaration.getVarSpecList() : emptyList(); | ||
| GoVarSpec singleVarSpec = varSpecs.size() == 1 ? getFirstItem(varSpecs) : null; | ||
| List<GoVarDefinition> varDefinitions = singleVarSpec != null ? singleVarSpec.getVarDefinitionList() : emptyList(); | ||
| return varDefinitions.size() == 1 && isResolvedTo(definition, getFirstItem(varDefinitions)) ? singleVarSpec : null; |
Contributor
There was a problem hiding this comment.
If you know that definition is GoVarDefinition use == or equals
| } | ||
|
|
||
| @Nullable | ||
| private static GoCompositeLit getStructLiteral(@NotNull GoStatementImpl statement, |
Contributor
There was a problem hiding this comment.
It's getOrCreateStructLiteral and better create composite literal more clear.
you check was struct literal created again in getData : isUnassigned(getSingleVarSpecByDefinition(previousStatement, structDefinition)))
Contributor
Author
|
Force pushed |
ibrque
reviewed
Nov 3, 2016
|
|
||
| if (!data.needReplaceDeclarationWithShortVar()) return; | ||
| data.getStructDeclaration() | ||
| .replace(GoElementFactory.createShortVarDeclarationStatement(project, data.getStructVarName(), data.getCompositeLit().getText())); |
Contributor
There was a problem hiding this comment.
extract variable for more readability, please
| boolean needReplaceDeclarationWithShortVar = isUnassigned(getSingleVarSpecByDefinition(previousStatement, structDefinition)); | ||
|
|
||
| GoCompositeLit compositeLit = needReplaceDeclarationWithShortVar | ||
| ? createStructLiteral(structDefinition, previousStatement.getProject()) |
Contributor
There was a problem hiding this comment.
You shouldn't create struct literal at this place. Because method name is getData and it's called in isAviable
| moveFieldReferenceExpressions(data); | ||
|
|
||
| if (!data.needReplaceDeclarationWithShortVar()) return; | ||
| data.getStructDeclaration() |
| return myReferenceExpressions; | ||
| } | ||
|
|
||
| public GoStatement getStructDeclaration() { |
| @NotNull List<GoReferenceExpression> referenceExpressions, | ||
| @Nullable GoStatement structDeclaration, | ||
| @Nullable String structVarName, | ||
| boolean needReplaceDeclarationWithShortVar) { |
Contributor
There was a problem hiding this comment.
I think you can get rid of needReplaceDeclarationWithShortVar field by giving null compositeLit
wbars
force-pushed
the
move-to-struct
branch
2 times, most recently
from
f8a68be to
fdb56e7
Compare
Contributor
Author
|
Updated |
wbars
force-pushed
the
move-to-struct
branch
4 times, most recently
from
57a8f43 to
7640c4f
Compare
Replace single struct declaration with short var declaration, or add to existing struct literal in statement
Contributor
Contributor
Author
|
@grenki Still can't fully beat naming problem, I guess :) Thanks for the review. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace single struct declaration with short var declaration, or add to existing struct literal in statement.