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

throwing exception fixed #116

Merged
merged 1 commit into from
Mar 2, 2025
Merged

throwing exception fixed #116

Show file tree
Hide file tree
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
8 changes: 5 additions & 3 deletions src/main/java/org/kdb/inside/brains/lang/annotation/impl/QSpecAnnotator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,11 @@ public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws
final QExpressions existExpressions = exist.getExpressions();
if (existExpressions == null) {
final QLambdaExpr lambda = exist.getLambda();
final PsiElement lastChild = lambda.getLastChild();
lambda.addBefore(expressions, lastChild);
lambda.addBefore(QPsiUtil.createWhitespace(project, "\n"), lastChild);
if (lambda != null) {
final PsiElement lastChild = lambda.getLastChild();
lambda.addBefore(expressions, lastChild);
lambda.addBefore(QPsiUtil.createWhitespace(project, "\n"), lastChild);
}
} else if (expressions.getChildren().length > 0) {
existExpressions.add(QPsiUtil.createWhitespace(project, "\n\n"));
final @NotNull PsiElement[] children = expressions.getChildren();
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/kdb/inside/brains/lang/completion/qspec/BaseQSpecGenerateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ protected void insertCode(@NotNull Project project,

final TestItem root = descriptor.getLocalRoot();
final QLambdaExpr lambda = root.getLambda();
if (lambda == null) {
return;
}
final QExpressions expressions = lambda.getExpressions();
if (expressions == null) {
PsiElement expr = ((QLambdaExpr) createCustomCode(project, "{`}")).getExpressions();
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/kdb/inside/brains/lang/qspec/TestItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,15 @@ public QInvokeFunction getInvoke() {
return invoke;
}

@NotNull
@Nullable
public QLambdaExpr getLambda() {
return (QLambdaExpr) Objects.requireNonNull(invoke.getExpression());
return invoke.getExpression() instanceof QLambdaExpr lambda ? lambda : null;
}

@Nullable
public QExpressions getExpressions() {
return getLambda().getExpressions();
final QLambdaExpr lambda = getLambda();
return lambda == null ? null : lambda.getExpressions();
}

public boolean is(String name) {
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/kdb/inside/brains/psi/refs/QSpecReferenceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ProcessingContext;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.kdb.inside.brains.lang.qspec.TestDescriptor;
import org.kdb.inside.brains.lang.qspec.TestItem;
import org.kdb.inside.brains.psi.*;
Expand Down Expand Up @@ -116,7 +117,11 @@ protected ResolveResult[] resolveElement(QVariable element) {
return symbols.stream().map(PsiElementResolveResult::new).toArray(ResolveResult[]::new);
}

private void collectMockDeclarations(PsiElement el, String name, List<QSymbol> symbols) {
private void collectMockDeclarations(@Nullable PsiElement el, String name, List<QSymbol> symbols) {
if (el == null) {
return;
}

final Collection<QVarReference> vars = PsiTreeUtil.findChildrenOfType(el, QVarReference.class);
if (vars.isEmpty()) {
return;
Expand Down
Loading