Skip to content

Commit 71b4f1b

Browse files
authored
Re-enable this-escape warning, suppress as needed (#2953)
ANTLR now suppresses it properly. We also need to generally suppress it for now, since we use a lot of weird initialization patterns. Cleaning these up would be nice in the future.
1 parent 74dbdf0 commit 71b4f1b

42 files changed

Lines changed: 81 additions & 44 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ tasks
1414
.withType<JavaCompile>()
1515
.matching { it.name == "compileJava" || it.name == "compileTestJava" }
1616
.configureEach {
17-
// TODO: re-enable this-escape when ANTLR suppresses it properly
1817
val disabledLint = listOf(
19-
"processing", "path", "fallthrough", "serial", "overloads", "this-escape",
18+
"processing", "path", "fallthrough", "serial", "overloads",
2019
)
2120
options.release.set(25)
2221
options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })

worldedit-bukkit/src/main/java/com/sk89q/wepif/PermissionsResolverManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public static PermissionsResolverManager getInstance() {
100100
FlatFilePermissionsResolver.class,
101101
};
102102

103+
@SuppressWarnings("this-escape")
103104
protected PermissionsResolverManager(Plugin plugin) {
104105
this.server = plugin.getServer();
105106
new ServerListener().register(plugin); // Register the events

worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlatform.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public abstract class CoreMcPlatform extends AbstractPlatform implements MultiUs
7979
private boolean hookingEvents = false;
8080
private CoreMcPermissionsProvider permissionsProvider;
8181

82+
@SuppressWarnings("this-escape")
8283
protected CoreMcPlatform(CoreMcMod mod, Lifecycled<MinecraftServer> server) {
8384
this.mod = mod;
8485
this.dataFixer = new CoreMcDataFixer(this, getDataVersion());

worldedit-core-mc/src/main/java/com/sk89q/worldedit/coremc/internal/CoreMcPlayer.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@ public CoreMcPlayer(CoreMcPlatform platform, ServerPlayer player) {
6666
this.platform = platform;
6767
this.player = player;
6868

69-
if (getUniqueId() == null) {
70-
throw new AssertionError("Player UUID cannot be null");
71-
}
72-
73-
ThreadSafeCache.getInstance().getOnlineIds().add(getUniqueId());
69+
ThreadSafeCache.getInstance().getOnlineIds().add(player.getUUID());
7470
}
7571

7672
@Override

worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public SkullBlock(BlockState state) {
5454
* @param blockState BlockState to set
5555
* @param owner name of player
5656
*/
57+
@SuppressWarnings("this-escape")
5758
public SkullBlock(BlockState blockState, String owner) {
5859
super(blockState);
5960
this.setOwner(owner);

worldedit-core/src/main/java/com/sk89q/worldedit/extension/input/ParserContext.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public ParserContext() {
5656
* @param other the other instance
5757
*/
5858
public ParserContext(ParserContext other) {
59-
setExtent(other.getExtent());
60-
setSession(other.getSession());
61-
setWorld(other.getWorld());
62-
setActor(other.getActor());
63-
setRestricted(other.isRestricted());
64-
setPreferringWildcard(other.isPreferringWildcard());
65-
setTryLegacy(other.isTryingLegacy());
59+
this.extent = other.extent;
60+
this.session = other.session;
61+
this.world = other.world;
62+
this.actor = other.actor;
63+
this.restricted = other.restricted;
64+
this.tryLegacy = other.tryLegacy;
65+
this.preferringWildcard = other.preferringWildcard;
6666
}
6767

6868
/**

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlatform.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@
3939
public abstract class AbstractPlatform implements Platform {
4040

4141
private final ResourceLoader resourceLoader = new WorldEditResourceLoader(WorldEdit.getInstance());
42+
@SuppressWarnings("this-escape")
4243
private final LazyReference<ArchiveUnpacker> archiveUnpacker = LazyReference.from(() -> {
4344
try {
4445
return new ArchiveUnpacker(getConfiguration().getWorkingDirectoryPath().resolve(".archive-unpack"));
4546
} catch (IOException e) {
4647
throw new UncheckedIOException(e);
4748
}
4849
});
50+
@SuppressWarnings("this-escape")
4951
private final LazyReference<TranslationManager> translationManager = LazyReference.from(() -> {
5052
try {
5153
return new TranslationManager(archiveUnpacker.getValue(), getResourceLoader());

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public class PlatformManager {
9494
*
9595
* @param worldEdit the WorldEdit instance
9696
*/
97+
@SuppressWarnings("this-escape")
9798
public PlatformManager(WorldEdit worldEdit) {
9899
checkNotNull(worldEdit);
99100
this.worldEdit = worldEdit;

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
*/
4646
public class BlockArrayClipboard implements Clipboard {
4747

48+
private static BlockVector3 getDimensions(Region region) {
49+
return region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1);
50+
}
51+
4852
private final Region region;
4953
private BlockVector3 origin;
5054
/**
@@ -73,7 +77,7 @@ public BlockArrayClipboard(Region region) {
7377
this.region = region.clone();
7478
this.origin = region.getMinimumPoint();
7579

76-
BlockVector3 dimensions = getDimensions();
80+
BlockVector3 dimensions = getDimensions(region);
7781
blocks = new BaseBlock[dimensions.x() * dimensions.y() * dimensions.z()];
7882
yStride = dimensions.x();
7983
zStride = yStride * dimensions.y();
@@ -100,7 +104,7 @@ public void setOrigin(BlockVector3 origin) {
100104

101105
@Override
102106
public BlockVector3 getDimensions() {
103-
return region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1);
107+
return getDimensions(region);
104108
}
105109

106110
@Override

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/AbstractExtentMask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public abstract class AbstractExtentMask extends AbstractMask {
3636
* @param extent the extent
3737
*/
3838
protected AbstractExtentMask(Extent extent) {
39-
setExtent(extent);
39+
this.extent = extent;
4040
}
4141

4242
/**

0 commit comments

Comments
 (0)