Finish 1.3.6

Err0-io · Jul 7, 2023 · c8bf940 · c8bf940
2 parents b257fdd + 61e9dcf
commit c8bf940
Show file tree

Hide file tree

Showing 5 changed files with 1,932 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 group = "io.err0"
-version = "1.3.5-BETA"
+version = "1.3.6-BETA"
 
 repositories {
   mavenCentral()

diff --git a/src/main/java/io/err0/client/languages/RubySourceCodeParse.java b/src/main/java/io/err0/client/languages/RubySourceCodeParse.java
@@ -128,6 +128,7 @@ public static RubySourceCodeParse lex(final CodePolicy policy, final String sour
                 } else {
                     currentToken.sourceCode.append(line).append('\n');
                     i = last;
+                    ++lineNumber;
                 }
                 continue;
             }

diff --git a/src/test/java/io/err0/client/test/Test0020Ruby.java b/src/test/java/io/err0/client/test/Test0020Ruby.java
@@ -103,4 +103,68 @@ public void t0001InjectErrorCodes() {
             assertEquals(18, previousState.metaDataStorage.size());
         }
     }
+
+    @Test
+    public void t0002ContextBug() {
+
+        UnitTestApiProvider.UnitTestState previousState = null;
+
+        // pass #1 - scan and analyse
+        {
+
+            final String sourceDir = "src/test/testdata/0020/03";
+            final String assertDir = "src/test/testdata/0020/03-assert";
+
+            final ProjectPolicy policy = TestPolicy.getPolicy();
+            assertNotNull(policy);
+
+            final GlobalState globalState = new GlobalState();
+            assertNotNull(globalState);
+
+            final UnitTestApiProvider apiProvider = new UnitTestApiProvider();
+            final ResultDriver driver = apiProvider.getDriver();
+
+            Main.scan(policy, globalState, sourceDir, apiProvider, false);
+            Main._import(apiProvider, globalState, policy);
+            Main.runInsert(apiProvider, globalState, policy, driver, apiProvider.createRun(policy), new StatisticsGatherer());
+
+            // output the results to 01-assert
+            // apiProvider.writeResultsTo(assertDir);
+
+            apiProvider.resultStorage.forEach((filename, result) -> {
+                try {
+                    final String expectedSourceCode = Utils.readString(Utils.pathOf(assertDir + "/" + filename));
+                    assertEquals(expectedSourceCode, result.sourceCode, filename);
+                } catch (IOException e) {
+                    fail(e);
+                }
+            });
+
+            assertEquals(globalState.files.size(), apiProvider.resultStorage.size());
+
+            previousState = apiProvider.getState();
+
+            // check context is correct for this error number
+            {
+                UnitTestApiProvider.MetaData metaData = previousState.metaDataStorage.get(1L);
+                assertNotNull(metaData);
+                assertEquals(620, metaData.metaData.get("line").getAsLong());
+            }
+            {
+                UnitTestApiProvider.MetaData metaData = previousState.metaDataStorage.get(2L);
+                assertNotNull(metaData);
+                assertEquals(623, metaData.metaData.get("line").getAsLong());
+            }
+            {
+                UnitTestApiProvider.MetaData metaData = previousState.metaDataStorage.get(3L);
+                assertNotNull(metaData);
+                assertEquals(916, metaData.metaData.get("line").getAsLong());
+            }
+            {
+                UnitTestApiProvider.MetaData metaData = previousState.metaDataStorage.get(4L);
+                assertNotNull(metaData);
+                assertEquals(927, metaData.metaData.get("line").getAsLong());
+            }
+        }
+    }
 }