Skip to content

Improve getter folding (fixes #90) #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfcabral wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve getter folding (fixes #90) #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/com/intellij/advancedExpressionFolding/AdvancedExpressionFoldingBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,18 +1761,15 @@ && startsWith(((PsiMethodCallExpression) argument).getMethodExpression().getRefe
}

}
if (settings.getState().isGetSetExpressionsCollapse()) {
if (identifier.isPresent() && ((startsWith(identifier.get().getText(), "get") && identifier.get().getText().length() > 3)
|| (identifier.get().getText().startsWith("is") && identifier.get().getText().length() > 2))
&& element.getArgumentList().getExpressions().length == 0) {
if (settings.getState().isGetSetExpressionsCollapse() && identifier.isPresent()) {
if (isGetter(identifier.get(), element)) {
return new Getter(element, element.getTextRange(), TextRange.create(identifier.get().getTextRange().getStartOffset(),
element.getTextRange().getEndOffset()),
qualifier != null
? getAnyExpression(qualifier, document)
: null,
guessPropertyName(identifier.get().getText()));
} else if (identifier.isPresent()
&& identifier.get().getText().startsWith("set")
} else if (identifier.get().getText().startsWith("set")
&& identifier.get().getText().length() > 3
&& Character.isUpperCase(identifier.get().getText().charAt(3))
&& element.getArgumentList().getExpressions().length == 1
Expand All @@ -1790,6 +1787,17 @@ && startsWith(((PsiMethodCallExpression) argument).getMethodExpression().getRefe
return null;
}

private static boolean isGetter(@NotNull PsiElement element, @NotNull PsiMethodCallExpression expression) {
return expression.getArgumentList().getExpressions().length == 0
&& (isGetterAux(element.getText(), "get") || isGetterAux(element.getText(), "is"));
}

private static boolean isGetterAux(@Nullable String name, @NotNull String prefix) {
return startsWith(name, prefix)
&& name.length() > prefix.length()
&& Character.isUpperCase(name.charAt(prefix.length()));
}

static int findDot(@NotNull Document document, int position, int i) {
int offset = 0;
while (Math.abs(offset) < 100 && position > 0 && position < document.getText().length() && !document.getText(TextRange.create(position, position + 1)).equals(".")) {
Expand Down