Cleanup keywords list a bit more

Author: Col-E

recaf-core/src/main/java/software/coley/recaf/services/mapping/gen/filter/IncludeKeywordNameFilter.java

@@ -51,6 +51,9 @@ public boolean shouldMapMethod(@Nonnull ClassInfo owner, @Nonnull MethodMember i
 
 	@Override
 	public boolean shouldMapLocalVariable(@Nonnull ClassInfo owner, @Nonnull MethodMember declaringMethod, @Nonnull LocalVariable variable) {
+		// Edge case: 'this' is allowed only as local variable slot 0 on non-static methods.
+		if (!declaringMethod.hasStaticModifier() && variable.getIndex() == 0 && "this".equals(variable.getName()))
+			return false;
 		if (containsKeyword(variable.getName()))
 			return true;
 		return super.shouldMapLocalVariable(owner, declaringMethod, variable);

recaf-core/src/main/java/software/coley/recaf/util/Keywords.java

@@ -23,23 +23,22 @@ public static Set<String> getKeywords() {
 		return Collections.unmodifiableSet(keywords);
 	}
 
+	// Commented out items are 'keywords' but can be used as names.
 	static {
-		// Commented out items are 'keywords' but can be used as names.
-		keywords.addAll(Arrays.asList("abstract",
+		// Misc language constructs
+		keywords.addAll(Arrays.asList(
 				"assert",
 				"break",
 				// "bridge",
 				"case",
 				"catch",
 				"class",
-				"const",
 				"continue",
 				"default",
 				"do",
 				"else",
 				"enum",
 				"extends",
-				"final",
 				"finally",
 				"while",
 				"for",
@@ -51,29 +50,39 @@ public static Set<String> getKeywords() {
 				"interface",
 				// "mandated",
 				// "module",
-				"native",
 				"new",
 				// "open",
+				"package",
+				"record",
+				"return",
+				"super",
+				"try",
+				"this",
+				"throw",
+				"throws"
+				// "var",
+				// "varargs",
+				// "yield"
+		));
+
+		// Modifiers
+		keywords.addAll(Arrays.asList(
+				"abstract",
+				"const",
+				"final",
+				"native",
 				"private",
 				"protected",
 				"public",
-				"record",
-				"return",
 				"static",
 				"strictfp",
-				"super",
 				"synchronized",
 				// "synthetic",
 				"transient",
-				"try",
-				"throw",
-				"throws",
 				// "transitive",
-				// "var",
-				// "varargs",
-				"volatile",
-				"yield"
+				"volatile"
 		));
+
 		// Primitive types
 		keywords.addAll(Arrays.asList(
 				"boolean",
@@ -84,7 +93,13 @@ public static Set<String> getKeywords() {
 				"long",
 				"float",
 				"double",
-				"void",
+				"void"
+		));
+
+		// Primitive values
+		keywords.addAll(Arrays.asList(
+				"true",
+				"false",
 				"null"
 		));
 	}