Collect all comments (#633)

- Comments are now appended - pin dashmap's version
swc-project · Feb 7, 2020 · 26eb4e3 · 26eb4e3
1 parent 05be89c
commit 26eb4e3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ once_cell = "1"
 hashbrown = "0.6"
 regex = "1"
 either = "1"
-dashmap = "3.2.2"
+dashmap = "=3.4.0"
 sourcemap = "4.1.1  "
 
 [dev-dependencies]

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swc_common"
-version = "0.5.0"
+version = "0.5.2"
 authors = ["강동윤 <kdy1997.dev@gmail.com>"]
 license = "Apache-2.0/MIT"
 repository = "https://github.com/swc-project/swc.git"
@@ -28,7 +28,7 @@ parking_lot = "0.7.1"
 hashbrown = "0.6"
 termcolor = "1.0"
 serde = { version = "1", features = ["derive"] }
-dashmap = "3.2.2"
+dashmap = "=3.4.0"
 fxhash = "0.2.1"
 
 

diff --git a/common/src/comments.rs b/common/src/comments.rs
@@ -28,7 +28,7 @@ impl Default for Comments {
 
 impl Comments {
     pub fn add_leading(&self, pos: BytePos, cmt: Vec<Comment>) {
-        self.leading.insert(pos, cmt);
+        self.leading.entry(pos).or_default().extend(cmt);
     }
 
     pub fn add_trailing(&self, pos: BytePos, cmt: Comment) {

diff --git a/ecmascript/preset_env/Cargo.toml b/ecmascript/preset_env/Cargo.toml
@@ -21,7 +21,7 @@ once_cell = "1.2.0"
 hashbrown = "0.6"
 st-map = "0.1.2"
 fxhash = "0.2.1"
-dashmap = "3.2.2"
+dashmap = "=3.4.0"
 
 [dev-dependencies]
 swc_ecma_codegen = { path = "../codegen" }

diff --git a/ecmascript/transforms/Cargo.toml b/ecmascript/transforms/Cargo.toml
@@ -14,7 +14,7 @@ swc_common = { version = "0.5.0", path ="../../common" }
 swc_ecma_ast = { version = "0.16.0", path ="../ast" }
 swc_ecma_utils = { version = "0.3.0", path ="../utils" }
 swc_ecma_parser = { version = "0.18", path ="../parser", features = ["verify"] }
-dashmap = "3.2.2"
+dashmap = "=3.4.0"
 either = "1.5"
 fxhash = "0.2"
 indexmap = "1"