Handle Lua variable reassignments

Author: tomcashman

gettext-gradle-plugin/src/main/java/org/mini2Dx/gettext/plugin/file/LuaFile.java

@@ -173,24 +173,35 @@ private void extractFromTable(int lineNumber, String key) {
 
 	@Override
 	public void exitStat(LuaParser.StatContext ctx) {
-		if(ctx.namelist() != null && ctx.explist() != null) {
-			final List<String> variableNames = new ArrayList<String>();
-			for(int i = 0; i < ctx.namelist().NAME().size(); i++) {
+		final List<String> variableNames;
+		if (ctx.namelist() != null && ctx.explist() != null) {
+			variableNames = new ArrayList<String>();
+			for (int i = 0; i < ctx.namelist().NAME().size(); i++) {
 				variableNames.add(ctx.namelist().NAME().get(i).getText());
 			}
-			for(int i = 0; i < ctx.explist().exp().size(); i++) {
-				String value = ctx.explist().exp(i).getText();
-				if(variables.containsKey(value)) {
-					value = variables.get(value);
-				} else if(value.startsWith("\"") && value.endsWith("\"")) {
-					value = value.substring(1, value.length() - 1);
-					value = value.replace("\"..\"", "");
-				}
+			storeVariables(variableNames, ctx);
+		} else if(ctx.varlist() != null && ctx.explist() != null) {
+			variableNames = new ArrayList<String>();
+			for (int i = 0; i < ctx.varlist().var().size(); i++) {
+				variableNames.add(ctx.varlist().var(i).NAME().getText());
+			}
+			storeVariables(variableNames, ctx);
+		}
+	}
 
-				for(String variableName : variableNames) {
-					variables.put(variableName, value);
-					variableByLineNumber.put(variableName, ctx.start.getLine());
-				}
+	protected void storeVariables(final List<String> variableNames, LuaParser.StatContext ctx) {
+		for (int i = 0; i < ctx.explist().exp().size(); i++) {
+			String value = ctx.explist().exp(i).getText();
+			if (variables.containsKey(value)) {
+				value = variables.get(value);
+			} else if (value.startsWith("\"") && value.endsWith("\"")) {
+				value = value.substring(1, value.length() - 1);
+				value = value.replace("\"..\"", "");
+			}
+
+			for (String variableName : variableNames) {
+				variables.put(variableName, value);
+				variableByLineNumber.put(variableName, ctx.start.getLine());
 			}
 		}
 	}

gettext-gradle-plugin/src/test/java/org/mini2Dx/gettext/plugin/file/LuaFileTest.java

@@ -27,14 +27,16 @@ public class LuaFileTest {
 	private static final String TRC_FILENAME = "sampleTrc.lua";
 	private static final String TRN_FILENAME = "sampleTrn.lua";
 	private static final String TRNC_FILENAME = "sampleTrnc.lua";
+	private static final String REASSIGN_FILENAME = "varReassign.lua";
+
 	private static final String COMMENT_FORMAT = "#.";
 	private static final String FORCE_EXTRACT_FORMAT = "#!extract";
 	private static final String IGNORE_FORMAT = "#!ignore";
 
 	private static final String TR_CUSTOM_COMMENT_FILENAME = "sampleTrCustomComment.lua";
 	private static final String CUSTOM_COMMENT_FORMAT = " #. ";
 
-	private static LuaFile TR_FILE, TRC_FILE, TRN_FILE, TRNC_FILE, TR_CUSTOM_COMMENT_FILE;
+	private static LuaFile TR_FILE, TRC_FILE, TRN_FILE, TRNC_FILE, TR_CUSTOM_COMMENT_FILE, REASSIGN_FILE;
 
 	private final List<TranslationEntry> results = new ArrayList<TranslationEntry>();
 
@@ -51,6 +53,8 @@ public static void loadFiles() throws IOException {
 					COMMENT_FORMAT, FORCE_EXTRACT_FORMAT, IGNORE_FORMAT);
 			TR_CUSTOM_COMMENT_FILE = new LuaFile(LuaFileTest.class.getResourceAsStream("/" + TR_CUSTOM_COMMENT_FILENAME), TR_CUSTOM_COMMENT_FILENAME,
 					CUSTOM_COMMENT_FORMAT, FORCE_EXTRACT_FORMAT, IGNORE_FORMAT);
+			REASSIGN_FILE = new LuaFile(LuaFileTest.class.getResourceAsStream("/" + REASSIGN_FILENAME), REASSIGN_FILENAME,
+					COMMENT_FORMAT, FORCE_EXTRACT_FORMAT, IGNORE_FORMAT);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -247,4 +251,16 @@ public void testTrCustomComment() {
 		Assert.assertEquals(1, entry3.getExtractedComments().size());
 		Assert.assertEquals("Comment 1", entry3.getExtractedComments().get(0));
 	}
+
+	@Test
+	public void testTrReassignVariable() {
+		REASSIGN_FILE.getTranslationEntries(results);
+
+		Assert.assertEquals(1, results.size());
+
+		final TranslationEntry entry0 = results.get(0);
+		Assert.assertEquals(REASSIGN_FILENAME + ":3", entry0.getReference());
+		Assert.assertEquals("Re-assigned Ref", entry0.getId());
+		Assert.assertEquals(0, entry0.getExtractedComments().size());
+	}
 }

gettext-gradle-plugin/src/test/resources/varReassign.lua

@@ -0,0 +1,3 @@
+local ref1 = "Variable Ref"
+ref1 = "Re-assigned Ref"
+npc:say(GetText:tr(ref1))