[royale-compiler] branch develop updated: GoogDepsWriter: fixed another situation where source maps were broken by post processing in GoogDepsWriter

[joshtynjala]

This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 5ed85d1  GoogDepsWriter: fixed another situation where source maps 
were broken by post processing in GoogDepsWriter
5ed85d1 is described below

commit 5ed85d1d43a6a89efbcd489a42731e7737505ca2
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Wed Feb 6 13:21:03 2019 -0800

    GoogDepsWriter: fixed another situation where source maps were broken by 
post processing in GoogDepsWriter
---
 .../org/apache/royale/compiler/internal/graph/GoogDepsWriter.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
index 4d17fe2..6e29953 100644
--- 
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
+++ 
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/graph/GoogDepsWriter.java
@@ -720,7 +720,9 @@ public class GoogDepsWriter {
                         }
                     }
                }
-                finalLines.add(line);
+                               finalLines.add(line);
+                               //no need to call addLineToSourceMap here 
because we're
+                               //populating finalLines for the first time
                 i++;
             }
             // add any static deps not already listed that were added by 
static initializers;
@@ -735,6 +737,7 @@ public class GoogDepsWriter {
                                String line = 
JSGoogEmitterTokens.GOOG_REQUIRE.getToken();
                                line += "('" + dep + "');";
                                finalLines.add(lastRequireLine++, line);
+                                               sourceMapConsumer = 
addLineToSourceMap(sourceMapConsumer, new File(gd.filePath).getName(), 
lastRequireLine);
                                System.out.println("adding require for static 
dependency " + dep + " to " + className);
                        }
                }