Skip to content

Commit f82a62c

Browse files
committed
spotless fixes
1 parent e457c95 commit f82a62c

7 files changed

Lines changed: 191 additions & 175 deletions

File tree

key.core/src/main/java/de/uka/ilkd/key/java/loader/JP2KeYConverter.java

Lines changed: 164 additions & 153 deletions
Large diffs are not rendered by default.

key.core/src/main/java/de/uka/ilkd/key/java/transformations/pipeline/JMLTransformer.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import de.uka.ilkd.key.speclang.jml.pretranslation.*;
1515
import de.uka.ilkd.key.speclang.njml.PreParser;
1616
import de.uka.ilkd.key.speclang.translation.SLTranslationException;
17-
1817
import de.uka.ilkd.key.util.parsing.BuildingException;
18+
1919
import org.key_project.util.collection.ImmutableList;
2020

2121
import com.github.javaparser.*;
@@ -147,8 +147,9 @@ public JMLTransformer(TransformationPipelineServices services) {
147147
throws SLTranslationException {
148148
NodeList<Modifier> modifiers = new NodeList<>();
149149
for (JMLModifier m : decl.getModifiers()) {
150-
if(m.equals(JMLModifier.MODEL)) {
151-
throw new BuildingException(decl.getDecl(), "Model modifier on variable declaration detected, only model fields are allowed");
150+
if (m.equals(JMLModifier.MODEL)) {
151+
throw new BuildingException(decl.getDecl(),
152+
"Model modifier on variable declaration detected, only model fields are allowed");
152153
}
153154

154155
Modifier mod = new Modifier(m.getParserKeyword());
@@ -276,7 +277,8 @@ private void transformClassLevelComments(TypeDeclaration<?> td) throws SLTransla
276277
// We might have multiple textual constructs now, because the single comment could
277278
// contain multiple JML entities (e.g. method contract and ghost field declaration)
278279

279-
de.uka.ilkd.key.java.Position pos = de.uka.ilkd.key.java.Position.fromOneZeroBased(1, 0);
280+
de.uka.ilkd.key.java.Position pos =
281+
de.uka.ilkd.key.java.Position.fromOneZeroBased(1, 0);
280282
ImmutableList<TextualJMLConstruct> constructs =
281283
pp.parseClassLevel(concatenatedComment, fileName, pos);
282284
services.addWarnings(pp.getWarnings());
@@ -372,8 +374,7 @@ private void transformClassLevelComments(TypeDeclaration<?> td) throws SLTransla
372374
}
373375

374376
private static @NonNull PreParser getPreParser() {
375-
return new PreParser(
376-
);
377+
return new PreParser();
377378
}
378379

379380
private void addClassSpec(TypeDeclaration<?> td, TextualJMLConstruct c) {
@@ -400,13 +401,14 @@ private void addLoopSpec(Node nextMember, TextualJMLLoopSpec spec) {
400401
specList.add(spec);
401402
}
402403

403-
private void transformMethodLevelCommentsAt(BlockStmt blockStmt, URI fileName) throws SLTranslationException {
404+
private void transformMethodLevelCommentsAt(BlockStmt blockStmt, URI fileName)
405+
throws SLTranslationException {
404406
PreParser io = getPreParser();
405407
var stmts = new ArrayList<>(blockStmt.getStatements());
406408
var newStmts = new ArrayList<Statement>(blockStmt.getStatements().size() * 2);
407409

408410
final de.uka.ilkd.key.java.Position pos =
409-
de.uka.ilkd.key.java.Position.fromOneZeroBased(1, 0);
411+
de.uka.ilkd.key.java.Position.fromOneZeroBased(1, 0);
410412

411413
for (int i = 0; i < stmts.size(); i++) {
412414
var stmt = stmts.get(i);

key.core/src/main/java/de/uka/ilkd/key/java/transformations/pipeline/TransformationPipelineServices.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.key_project.util.collection.ImmutableList;
1515

1616
import com.github.javaparser.JavaParser;
17-
import com.github.javaparser.Position;
1817
import com.github.javaparser.ast.CompilationUnit;
1918
import com.github.javaparser.ast.Modifier;
2019
import com.github.javaparser.ast.Node;
@@ -29,7 +28,6 @@
2928
import com.github.javaparser.resolution.model.SymbolReference;
3029
import com.github.javaparser.resolution.types.ResolvedReferenceType;
3130
import com.github.javaparser.resolution.types.ResolvedType;
32-
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
3331
import org.jspecify.annotations.NullMarked;
3432
import org.jspecify.annotations.Nullable;
3533
import org.slf4j.Logger;

key.core/src/main/java/de/uka/ilkd/key/parser/Location.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import java.util.Objects;
1111
import java.util.Optional;
1212

13-
import com.github.javaparser.ast.CompilationUnit;
14-
import com.github.javaparser.ast.Node;
1513
import de.uka.ilkd.key.java.Position;
1614
import de.uka.ilkd.key.util.MiscTools;
1715

16+
import com.github.javaparser.ast.CompilationUnit;
17+
import com.github.javaparser.ast.Node;
1818
import org.antlr.v4.runtime.IntStream;
1919
import org.antlr.v4.runtime.Token;
2020
import org.jspecify.annotations.NonNull;

key.core/src/main/java/de/uka/ilkd/key/speclang/njml/PreParser.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33
* SPDX-License-Identifier: GPL-2.0-only */
44
package de.uka.ilkd.key.speclang.njml;
55

6+
import java.net.URI;
7+
import java.util.ArrayList;
8+
import java.util.List;
9+
610
import de.uka.ilkd.key.java.Position;
711
import de.uka.ilkd.key.parser.Location;
812
import de.uka.ilkd.key.settings.ProofIndependentSettings;
913
import de.uka.ilkd.key.speclang.PositionedString;
1014
import de.uka.ilkd.key.speclang.jml.pretranslation.JMLModifier;
1115
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLConstruct;
1216
import de.uka.ilkd.key.speclang.jml.pretranslation.TextualJMLModifierList;
13-
import org.antlr.v4.runtime.ParserRuleContext;
14-
import org.jspecify.annotations.Nullable;
17+
1518
import org.key_project.util.collection.ImmutableList;
1619

17-
import java.net.URI;
18-
import java.util.ArrayList;
19-
import java.util.List;
20+
import org.antlr.v4.runtime.ParserRuleContext;
21+
import org.jspecify.annotations.Nullable;
2022

2123
/**
2224
* Transforms pure text comments into {@link TextualJMLConstruct}s.

key.core/src/main/java/de/uka/ilkd/key/util/parsing/HasLocation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import de.uka.ilkd.key.parser.Location;
88

9-
import org.jspecify.annotations.NonNull;
109
import org.jspecify.annotations.Nullable;
1110

1211
/**
@@ -21,5 +20,6 @@ public interface HasLocation {
2120
*
2221
* @return the location of the exception
2322
*/
24-
@Nullable Location getLocation();
23+
@Nullable
24+
Location getLocation();
2525
}

key.core/src/test/java/de/uka/ilkd/key/java/TestJavaDLASTExtensions.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,13 @@ public void testTypeNotInInnerScopeShouldNotBeFound() {
6363
public void testNestedMethodFrameRedirects() {
6464
try {
6565
HelperClassForTests.parseThrowException(
66-
testpath.resolve("typeResolutionInNestedMethodFrameResolvable.key"));
66+
testpath.resolve("typeResolutionInNestedMethodFrameResolvable.key"));
6767
} catch (Throwable t) {
68-
Assertions.fail("Resolution of type TestJavaCardDLExtensions should be successful as it is enclosed by the outer method frame " +
69-
"which redirects the scope to package sub1. Class Third should be resolvable (and visible) as the inner method-frame redirects to package sub2." +
68+
Assertions.fail(
69+
"Resolution of type TestJavaCardDLExtensions should be successful as it is enclosed by the outer method frame "
70+
+
71+
"which redirects the scope to package sub1. Class Third should be resolvable (and visible) as the inner method-frame redirects to package sub2."
72+
+
7073
"\n\n" + t);
7174
}
7275

0 commit comments

Comments
 (0)