Skip to content
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

Jump to bottom

Add useless ternary operator diagnostic #1820

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Add useless ternary operator diagnostic #1820

wants to merge 8 commits into from

Conversation

EvgSychev
Copy link
Contributor

@EvgSychev EvgSychev commented Sep 16, 2021 •
edited by otymko
Loading

Описание

Связанные задачи

Closes #203

Чеклист

Общие

  • Ветка PR обновлена из develop
  • Отладочные, закомментированные и прочие, не имеющие смысла участки кода удалены
  • Изменения покрыты тестами
  • Обязательные действия перед коммитом выполнены (запускал команду gradlew precommit)

Для диагностик

  • Описание диагностики заполнено для обоих языков (присутствуют файлы для обоих языков, для русского заполнено все подробно, перевод на английский можно опустить)

Дополнительно

@EvgSychev
Copy link
Contributor Author

Забыл досаду приатачить, как исправить?

@EvgSychev EvgSychev closed this Sep 17, 2021
@nixel2007
Copy link
Member

nixel2007 commented Sep 17, 2021 •
edited
Loading

@EvgSychev отредактировать первый пост. но вроде @otymko уже поправил

@nixel2007 nixel2007 reopened this Sep 17, 2021
artbear
artbear suggested changes Sep 18, 2021
View reviewed changes
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Outdated Show resolved Hide resolved
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Show resolved Hide resolved
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Outdated Show resolved Hide resolved
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Show resolved Hide resolved
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Show resolved Hide resolved
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Outdated Show resolved Hide resolved
artbear
artbear suggested changes Sep 24, 2021
View reviewed changes
Copy link
Contributor

@artbear artbear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

похоже на ошибку

...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java Show resolved Hide resolved
@EvgSychev
Copy link
Contributor Author

3 варианта потому, что это не один и тот же optinal, два преобразуются и каждый по своему, третий на тот случае если ничего не найдено, тесты код прошёл

nixel2007
nixel2007 reviewed Oct 6, 2021
View reviewed changes
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java
}

private String getAdaptedText(String text) {
if(documentContext.getServerContext().getConfiguration().getDefaultLanguage() == MDLanguage.ENGLISH) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

лучше заменить на вызов documentContext.getScriptVariantLocale()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ну и вообще бы это перевесить на работу с Resources#getResourceString

nixel2007
nixel2007 reviewed Oct 6, 2021
View reviewed changes
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java
.filter(BSLParser.ConstValueContext.class::isInstance)
.map(BSLParser.ConstValueContext.class::cast);

return tmpCtx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тэкс, а зачем все это ниже, если можно просто tmpCtx.filter(ctx -> ctx.TRUE() || ctx.FALSE).isPresent() и сменить возвращаемое значение с int на boolean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Дальше по коду нужно знать в какой ветке у нас Истина, в какой ложь

nixel2007
nixel2007 reviewed Oct 6, 2021
View reviewed changes
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java

var tmpCtx = Optional.of(expCtx)
.filter(ctx -> ctx.children.size() == 1)
.map(ctx -> (BSLParser.MemberContext) ctx.getChild(0))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

просто .map(ctx -> ctx.member()) или сразу .map(BSLParser.ExpressionContext::member)), нет нужды работать с детьми в грязную

nixel2007
nixel2007 reviewed Oct 6, 2021
View reviewed changes
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java
var tmpCtx = Optional.of(expCtx)
.filter(ctx -> ctx.children.size() == 1)
.map(ctx -> (BSLParser.MemberContext) ctx.getChild(0))
.map(ctx -> ctx.getChild(0))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

вместо этого вызова и двух вызовов ниже можно взять .map(ctx -> ctx.constValue(). если constValue в этом expression нет, то метод вернет null и Optional станет empty

nixel2007
nixel2007 reviewed Oct 6, 2021
View reviewed changes
...a/com/github/_1c_syntax/bsl/languageserver/diagnostics/UselessTernaryOperatorDiagnostic.java
var exp = ctx.expression();
var condition = getBooleanToken(exp.get(0));
var trueBranch = getBooleanToken(exp.get(1));
var falseBranch = getBooleanToken(exp.get(2));
Copy link
Member

@nixel2007 nixel2007 Oct 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

я бы на всякий случай перед всеми этими дерганиями по индексу проверил, что exp.size() == 3. опасаюсь IndexOutOfBoundException при наборе текста

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Если не 3 падаем?

@nixel2007
Copy link
Member

/rebase

@nixel2007
Copy link
Member

@EvgSychev мерж поломал addDiagnostic

@EvgSychev
Copy link
Contributor Author

@nixel2007 ошибочно сделал pull, будет исправлено

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artbear artbear artbear requested changes

@nixel2007 nixel2007 nixel2007 left review comments

Assignees
No one assigned
Labels
pr/waits-for-feedback
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Бесполезный тернарник / Странный тернарник
3 participants
@EvgSychev @nixel2007 @artbear