diff --git a/src/main/java/noppes/npcs/client/gui/util/script/RenameRefactorHandler.java b/src/main/java/noppes/npcs/client/gui/util/script/RenameRefactorHandler.java index cf6adb9e2..15a71a900 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/RenameRefactorHandler.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/RenameRefactorHandler.java @@ -97,27 +97,6 @@ public class RenameRefactorHandler { int getViewportWidth(); // For determining if clicks are in rename box } - /** - * Scope information for a variable - */ - public static class ScopeInfo { - public final int startOffset; - public final int endOffset; - public final boolean isGlobal; - public final String scopeType; // "global", "method", "block" - - public ScopeInfo(int start, int end, boolean isGlobal, String type) { - this.startOffset = start; - this.endOffset = end; - this.isGlobal = isGlobal; - this.scopeType = type; - } - - public boolean containsPosition(int pos) { - return pos >= startOffset && pos < endOffset; - } - } - public void setCallback(RenameCallback callback) { this.callback = callback; } diff --git a/src/main/java/noppes/npcs/client/gui/util/script/ScopeInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/ScopeInfo.java new file mode 100644 index 000000000..96da722df --- /dev/null +++ b/src/main/java/noppes/npcs/client/gui/util/script/ScopeInfo.java @@ -0,0 +1,26 @@ +package noppes.npcs.client.gui.util.script; + +/** + * Scope information for a variable + */ +public class ScopeInfo { + public final int startOffset; + public final int endOffset; + public final boolean isGlobal; + public final String scopeType; // "global", "method", "block" + + public ScopeInfo(int start, int end, boolean isGlobal, String type) { + this.startOffset = start; + this.endOffset = end; + this.isGlobal = isGlobal; + this.scopeType = type; + } + + public boolean containsPosition(int pos) { + return pos >= startOffset && pos < endOffset; + } + + public boolean isWithin(ScopeInfo other) { + return this.startOffset >= other.startOffset && this.endOffset <= other.endOffset; + } +}