1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00

fix: upgrade deno_ast to 0.19 (#15808)

This commit is contained in:
David Sherret 2022-09-07 15:06:18 -04:00 committed by Yoshiya Hinosawa
parent bf87c922e2
commit f258a05444
No known key found for this signature in database
GPG key ID: 0E8BFAA8A5B4E92B
10 changed files with 115 additions and 128 deletions

View file

@ -48,9 +48,9 @@
"tools/wpt/manifest.json"
],
"plugins": [
"https://plugins.dprint.dev/typescript-0.71.2.wasm",
"https://plugins.dprint.dev/json-0.15.5.wasm",
"https://plugins.dprint.dev/markdown-0.14.0.wasm",
"https://plugins.dprint.dev/typescript-0.73.1.wasm",
"https://plugins.dprint.dev/json-0.15.6.wasm",
"https://plugins.dprint.dev/markdown-0.14.1.wasm",
"https://plugins.dprint.dev/toml-0.5.4.wasm",
"https://plugins.dprint.dev/exec-0.3.1.json@9351b67ec7a6b58a69201c2834cba38cb3d191080aefc6422fb1320f03c8fc4d"
]

169
Cargo.lock generated
View file

@ -122,9 +122,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.58"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7"
[[package]]
name = "arrayvec"
@ -851,7 +851,7 @@ dependencies = [
"tempfile",
"test_util",
"text-size",
"text_lines 0.6.0",
"text_lines",
"tokio",
"tokio-util",
"tower-lsp",
@ -868,9 +868,9 @@ dependencies = [
[[package]]
name = "deno_ast"
version = "0.17.0"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42fb7189dc0564d7fc4d422868aad20cc6051b4469dad5a39a34bc4741cbc9ec"
checksum = "e5cf170fd04887b88d88c9951c2c2cb0e1feb1681636987fb3202384db962950"
dependencies = [
"anyhow",
"base64 0.13.0",
@ -894,7 +894,7 @@ dependencies = [
"swc_ecma_transforms_typescript",
"swc_ecma_utils",
"swc_ecma_visit",
"text_lines 0.4.1",
"text_lines",
"url 2.3.0",
]
@ -982,9 +982,9 @@ dependencies = [
[[package]]
name = "deno_doc"
version = "0.44.0"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f574fcfacf7b4ecce58c4cb67a3d76c025e4e010863e57f77827eaa9bf41248e"
checksum = "ef056cd1ca61584e7db9e3a025676f880be5a67101aee54f295b8770100eeb53"
dependencies = [
"cfg-if",
"deno_ast",
@ -1000,9 +1000,9 @@ dependencies = [
[[package]]
name = "deno_emit"
version = "0.8.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ae998e26631299d03ba724cef7a2337e06777b6dfeae432dc932810679a5b68"
checksum = "66d4279eb4772b17283f0aea3ba108872ef07a0174530e87a1e642aaa97d5ccc"
dependencies = [
"anyhow",
"base64 0.13.0",
@ -1062,9 +1062,9 @@ dependencies = [
[[package]]
name = "deno_graph"
version = "0.33.0"
version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8d375dac1b6f7092c29c4603a7795c98b55257d39e108da02dd5b4e42f9d8a6"
checksum = "65644f208cd3c64362bf298ccbb52cd606588d5d844f0a3ac8b8e187ea708b85"
dependencies = [
"anyhow",
"cfg-if",
@ -1108,9 +1108,9 @@ dependencies = [
[[package]]
name = "deno_lint"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a0d27a03b3da8aa2a3216a5f0568448b162202ab1f501f68f8566f864889464"
checksum = "cf964de0df9998ff7cb42b8013f582b1b34f0d180a5092274f11a1443879e612"
dependencies = [
"anyhow",
"deno_ast",
@ -1396,9 +1396,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
[[package]]
name = "dprint-core"
version = "0.58.3"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bb2ee795c5be6f6512908e599a9747c6121aae982a535f0704db11130b38a08"
checksum = "84600c297cc99fc088a9a916286d71915c988fa3a6f1bbc994ad9b93dde80c03"
dependencies = [
"anyhow",
"bumpalo",
@ -1409,22 +1409,22 @@ dependencies = [
[[package]]
name = "dprint-plugin-json"
version = "0.15.5"
version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a14e62fab38f93f1a5cba6ee069f401d7ab8dfddd694ca49caed935a98b3b61a"
checksum = "f7b6ffd969606d66570c259fea202ae6ba15f8e13ae285c8de604a07131ca1c8"
dependencies = [
"anyhow",
"dprint-core",
"jsonc-parser",
"serde",
"text_lines 0.4.1",
"text_lines",
]
[[package]]
name = "dprint-plugin-markdown"
version = "0.14.0"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52180eb2d0bdc4870630e0a76c71a7ce54c4320cf7ed5420ca73e874cf1d08b0"
checksum = "9d1219016fc87c5dbd1dda4560831ea92da8a1a2df612e62843e741c98b668c3"
dependencies = [
"anyhow",
"dprint-core",
@ -1435,9 +1435,9 @@ dependencies = [
[[package]]
name = "dprint-plugin-typescript"
version = "0.71.2"
version = "0.73.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e085faab0a1de74248f97a37f4ad4962cc542d5d4a67a3d7cb3363dc8c72109"
checksum = "33e614c08c52c6161bde5814f2e69b0a83dcf07ce647b79da30ba5df2e879b74"
dependencies = [
"anyhow",
"deno_ast",
@ -1448,9 +1448,9 @@ dependencies = [
[[package]]
name = "dprint-swc-ext"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83e1b7708a102f7c085a1d51429a3664fe4dd3f6bf67091de83c9dae4dc700e2"
checksum = "c478ec192ebe45411ebe70aef5bd33d22ec54ff7a08885dff16d0bb352525325"
dependencies = [
"bumpalo",
"num-bigint",
@ -1459,7 +1459,7 @@ dependencies = [
"swc_common",
"swc_ecma_ast",
"swc_ecma_parser",
"text_lines 0.4.1",
"text_lines",
]
[[package]]
@ -1630,9 +1630,9 @@ dependencies = [
[[package]]
name = "eszip"
version = "0.26.0"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8043f99a09a1a1d4449ffcd2b068fabf2cb6d70b406e11c2b2d623ce8984baa7"
checksum = "5332beee98150f70618017a2bfbd0d830652140015285e6d73a07a8f849a4008"
dependencies = [
"anyhow",
"base64 0.13.0",
@ -3843,9 +3843,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.141"
version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500"
checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
dependencies = [
"serde_derive",
]
@ -3861,9 +3861,9 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.141"
version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f"
checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
dependencies = [
"proc-macro2 1.0.39",
"quote 1.0.18",
@ -4129,9 +4129,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "swc_atoms"
version = "0.2.13"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d99c0ac33707dd1162a3665d6ca1a28b2f6594e9c37c4703e417fc5e1ce532e"
checksum = "8fb43a79c8affc20f5d52b7db093399585ce87674427adc60843dbc8ec242608"
dependencies = [
"once_cell",
"rustc-hash",
@ -4142,9 +4142,9 @@ dependencies = [
[[package]]
name = "swc_bundler"
version = "0.169.0"
version = "0.185.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fd675a730040ce147232e7021aebebfbe16098079824763578cd6b597632ccc"
checksum = "e868bb01c4716209191ce829bd1dde41af84710302e17e3aba1272ae7cc464ee"
dependencies = [
"ahash",
"anyhow",
@ -4174,9 +4174,9 @@ dependencies = [
[[package]]
name = "swc_common"
version = "0.23.0"
version = "0.27.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68e76a324fa0d7240e790c78914f39fdecfa9d87ef4efed591124b58607a4a4a"
checksum = "cba38a2f1291fcf3f78f357802b8cec72ecf5e95808e9d937783e60cd3570b93"
dependencies = [
"ahash",
"ast_node",
@ -4228,9 +4228,9 @@ dependencies = [
[[package]]
name = "swc_ecma_ast"
version = "0.84.0"
version = "0.90.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cce1fb31e3a100feb31f94647fe27e457bc13b17a8931204fdc9bc58a15c936a"
checksum = "41e78ceea39b1dacef1e7cda29488131677224bf6111ed5e853791d81c8a36da"
dependencies = [
"bitflags",
"is-macro",
@ -4245,14 +4245,15 @@ dependencies = [
[[package]]
name = "swc_ecma_codegen"
version = "0.115.0"
version = "0.123.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d09abf1639f76d3d174225fdb608805f9c21d4c455f4dd2ef6ab156701f1f82a"
checksum = "a787c39a5b30c077744c564c533bd294db36d70edfb43d1073e249ca14316b87"
dependencies = [
"memchr",
"num-bigint",
"once_cell",
"rustc-hash",
"serde",
"sourcemap",
"swc_atoms",
"swc_common",
@ -4276,9 +4277,9 @@ dependencies = [
[[package]]
name = "swc_ecma_dep_graph"
version = "0.83.0"
version = "0.90.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "832d9690a915f50c6dd86d107c9c9ec37b3d8dab59ed45814ba7bc63e0aa5a87"
checksum = "3cdd5d0018ab61eba3e0016f867f12f8d832d36ab93d64fa9d7119e188ac2c86"
dependencies = [
"swc_atoms",
"swc_common",
@ -4288,9 +4289,9 @@ dependencies = [
[[package]]
name = "swc_ecma_loader"
version = "0.35.0"
version = "0.39.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "710c86eb2b253160d4a02fa77057f1c493b3932d1b83430cbbc1e7823eb47e8c"
checksum = "ece6023a43222e3bd36e3d191fa5289c848245b97fbf0127d9c0923165648d18"
dependencies = [
"ahash",
"anyhow",
@ -4302,9 +4303,9 @@ dependencies = [
[[package]]
name = "swc_ecma_parser"
version = "0.111.0"
version = "0.118.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc1766e5b969c59e51a5dfe9337755d7380a891e579dd6b0eb7816587c7ea7aa"
checksum = "b993963c284a2cadf46213ba0f4faa8a5153cfb02437f07ef21ebd90e598cae7"
dependencies = [
"either",
"enum_kind",
@ -4321,13 +4322,12 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_base"
version = "0.97.0"
version = "0.106.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66b316a99dde0ef85f1878aaa9f4bf9b15f16e999c56ed31a1433928c754ae4e"
checksum = "ecfcecd7aad760171c0c392a856bec5291365a33bc03da5a1f24e26eccdffb7e"
dependencies = [
"better_scoped_tls",
"bitflags",
"num_cpus",
"once_cell",
"phf",
"rustc-hash",
@ -4344,9 +4344,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_classes"
version = "0.85.0"
version = "0.95.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c853c4366e81092d38b746e71adffc1150c694f02c1068c9fa24abbdc373a65f"
checksum = "b748eddc9fe274648f7f6344f405a520a30f8574af76f8fb22c6a59508418382"
dependencies = [
"swc_atoms",
"swc_common",
@ -4371,14 +4371,15 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_optimization"
version = "0.144.0"
version = "0.160.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9413ed145b0c3e693d18760a72c72bb7ac3e522edbb88bfe0c6c161a7b148281"
checksum = "d6deba435837e698ed8c26a0bf9ba24e08000874bb3ae92ddc59848800dfdc9e"
dependencies = [
"ahash",
"dashmap",
"indexmap",
"once_cell",
"petgraph",
"rustc-hash",
"serde_json",
"swc_atoms",
@ -4389,14 +4390,15 @@ dependencies = [
"swc_ecma_transforms_macros",
"swc_ecma_utils",
"swc_ecma_visit",
"swc_fast_graph",
"tracing",
]
[[package]]
name = "swc_ecma_transforms_proposal"
version = "0.122.0"
version = "0.137.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ebc6e03a51f9adcbc40ec144c9bbe78de872bf6f8f581f3abd51187ec6e648"
checksum = "b2bfcb3be3cdf374b53f61a2efdddfccaf6c1261171d02b0eb5838fd44c51223"
dependencies = [
"either",
"serde",
@ -4413,9 +4415,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_react"
version = "0.133.0"
version = "0.148.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6b0516e231008722175bc0841bf4f3fdcfd3276ca0bf4878d6e87af5c50f324"
checksum = "cb912b97e944a4bcf7088823efb068e037f5c64db9e75c94a3138bd8c202578f"
dependencies = [
"ahash",
"base64 0.13.0",
@ -4439,9 +4441,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_typescript"
version = "0.137.0"
version = "0.152.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6716a73401b5d717d6fd20159385ce09adbdd3afc765c3890859d84ada8af729"
checksum = "c919518f8b5f03df0e2c6a55ad44a0a3835125fbf569e5983bd2380b76e2e7c6"
dependencies = [
"serde",
"swc_atoms",
@ -4455,11 +4457,12 @@ dependencies = [
[[package]]
name = "swc_ecma_utils"
version = "0.93.0"
version = "0.101.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70981d5ef10c0ff0a002e21decbca9dde5b40c2fc0d0bc6eaebb219a8e0a5f7d"
checksum = "57a8a5b246246809b4cf526e838fd1284828ccaca56521d9af19b082862bc845"
dependencies = [
"indexmap",
"num_cpus",
"once_cell",
"swc_atoms",
"swc_common",
@ -4471,9 +4474,9 @@ dependencies = [
[[package]]
name = "swc_ecma_visit"
version = "0.70.0"
version = "0.76.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcd081250d664808fcd23110202728811236c87f527656ffc1db7f00ac1a06dd"
checksum = "c658568ed63dd13357bae4129999bacb9260d709f260fb49e14a56587ed5dab9"
dependencies = [
"num-bigint",
"swc_atoms",
@ -4485,9 +4488,9 @@ dependencies = [
[[package]]
name = "swc_eq_ignore_macros"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c8f200a2eaed938e7c1a685faaa66e6d42fa9e17da5f62572d3cbc335898f5e"
checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6"
dependencies = [
"pmutil",
"proc-macro2 1.0.39",
@ -4497,9 +4500,9 @@ dependencies = [
[[package]]
name = "swc_fast_graph"
version = "0.11.0"
version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9260826bb82481fb946ca653d10196f2653beba1b566b72f42ba7046e4ad0c8f"
checksum = "3f2eb48057452a960071c60e00e345b6fdd21b1ba62551b66ac7413cbae31501"
dependencies = [
"ahash",
"indexmap",
@ -4509,9 +4512,9 @@ dependencies = [
[[package]]
name = "swc_graph_analyzer"
version = "0.12.0"
version = "0.16.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9b192a3b556cf0a81b4dcb8fa35374d306cd46f806dce937599b40e2d945e51"
checksum = "ba02e0726abddde48fecef483fb0b067c88a6c0da736b91d3ef424be3cfcaa39"
dependencies = [
"ahash",
"auto_impl",
@ -4522,9 +4525,9 @@ dependencies = [
[[package]]
name = "swc_macros_common"
version = "0.3.5"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dca3f08d02da4684c3373150f7c045128f81ea00f0c434b1b012bc65a6cce3"
checksum = "a4be988307882648d9bc7c71a6a73322b7520ef0211e920489a98f8391d8caa2"
dependencies = [
"pmutil",
"proc-macro2 1.0.39",
@ -4534,9 +4537,9 @@ dependencies = [
[[package]]
name = "swc_visit"
version = "0.4.0"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fafa6c946bdbe601f5511140776d59e82a03f52a5e5039192b4b96f3ca639d88"
checksum = "b754ef01f2614eb469fd5215789bfd319566a3bf1033056d7a7bfb5a3c9a69f5"
dependencies = [
"either",
"swc_visit_macros",
@ -4544,9 +4547,9 @@ dependencies = [
[[package]]
name = "swc_visit_macros"
version = "0.4.0"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cad1b8e0b2d48660bc454f70495e9bb583f9bf501f28165568569946e62f44a2"
checksum = "c230bcd129d1fbcd1decd8b43cccd613fda11c895f7c04d6c966231dbc1959af"
dependencies = [
"Inflector",
"pmutil",
@ -4667,20 +4670,14 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
[[package]]
name = "text_lines"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e49e3c53dd04de8b8e8390bc4fab57f6db7af7d33b086fe411803e6351c9f9f9"
dependencies = [
"serde",
]
[[package]]
name = "text_lines"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fd5828de7deaa782e1dd713006ae96b3bee32d3279b79eb67ecf8072c059bcf"
dependencies = [
"serde",
]
[[package]]
name = "textwrap"

View file

@ -38,7 +38,7 @@ deno_webgpu = { version = "0.68.0", path = "../ext/webgpu" }
deno_websocket = { version = "0.72.0", path = "../ext/websocket" }
deno_webstorage = { version = "0.62.0", path = "../ext/webstorage" }
regex = "=1.6.0"
serde = { version = "=1.0.141", features = ["derive"] }
serde = { version = "=1.0.144", features = ["derive"] }
zstd = '=0.11.1'
[target.'cfg(windows)'.build-dependencies]
@ -46,12 +46,12 @@ winapi = "=0.3.9"
winres = "=0.1.12"
[dependencies]
deno_ast = { version = "0.17.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] }
deno_ast = { version = "0.19.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] }
deno_core = { version = "0.149.0", path = "../core" }
deno_doc = "0.44.0"
deno_emit = "0.8.0"
deno_graph = "0.33.0"
deno_lint = { version = "0.32.0", features = ["docs"] }
deno_doc = "0.45.0"
deno_emit = "0.9.0"
deno_graph = "0.34.0"
deno_lint = { version = "0.33.0", features = ["docs"] }
deno_runtime = { version = "0.75.0", path = "../runtime" }
deno_task_shell = "0.5.2"
@ -64,12 +64,12 @@ clap_complete = "=3.1.2"
clap_complete_fig = "=3.1.5"
data-url = "=0.1.1"
dissimilar = "=1.0.3"
dprint-plugin-json = "=0.15.5"
dprint-plugin-markdown = "=0.14.0"
dprint-plugin-typescript = "=0.71.2"
dprint-plugin-json = "=0.15.6"
dprint-plugin-markdown = "=0.14.1"
dprint-plugin-typescript = "=0.73.1"
encoding_rs = "=0.8.31"
env_logger = "=0.9.0"
eszip = "=0.26.0"
eszip = "=0.27.0"
fancy-regex = "=0.10.0"
flate2 = "=1.0.24"
http = "=0.2.6"
@ -93,7 +93,7 @@ rustyline = { version = "=10.0.0", default-features = false, features = ["custom
rustyline-derive = "=0.7.0"
secure_tempfile = { version = "=3.3.0", package = "tempfile" } # different name to discourage use in tests
semver = "=1.0.13"
serde = { version = "=1.0.141", features = ["derive"] }
serde = { version = "=1.0.144", features = ["derive"] }
serde_repr = "=0.1.8"
shell-escape = "=0.1.5"
tar = "=0.4.38"

8
cli/cache/common.rs vendored
View file

@ -34,6 +34,14 @@ impl FastInsecureHasher {
self
}
pub fn write_hashable(
&mut self,
hashable: &impl std::hash::Hash,
) -> &mut Self {
hashable.hash(&mut self.0);
self
}
pub fn finish(&self) -> u64 {
self.0.finish()
}

View file

@ -1149,7 +1149,7 @@ fn lsp_deno_graph_analyze(
let parsed_source_result = analyzer.parse_module(
specifier,
content.clone(),
get_media_type(specifier, maybe_headers),
MediaType::from_specifier_and_headers(specifier, maybe_headers),
);
let module_result = match &parsed_source_result {
Ok(_) => deno_graph::parse_module(
@ -1169,23 +1169,6 @@ fn lsp_deno_graph_analyze(
(Some(module_result), Some(parsed_source_result))
}
// todo(dsherret): use `MediaType::from_specifier_and_headers` once
// https://github.com/denoland/deno_ast/pull/108 is merged
fn get_media_type(
specifier: &ModuleSpecifier,
maybe_headers: Option<&HashMap<String, String>>,
) -> MediaType {
if let Some(headers) = maybe_headers {
if let Some(content_type) = headers.get("content-type") {
MediaType::from_content_type(specifier, content_type)
} else {
MediaType::from(specifier)
}
} else {
MediaType::from(specifier)
}
}
#[cfg(test)]
mod tests {
use super::*;

View file

@ -225,15 +225,15 @@ impl ProcState {
|| matches!(cli_options.sub_command(), DenoSubcommand::Lsp),
);
let emit_options: deno_ast::EmitOptions = ts_config_result.ts_config.into();
Ok(ProcState(Arc::new(Inner {
dir,
options: cli_options,
emit_cache,
emit_options_hash: FastInsecureHasher::new()
// todo(dsherret): use hash of emit options instead as it's more specific
.write(&ts_config_result.ts_config.as_bytes())
.write_hashable(&emit_options)
.finish(),
emit_options: ts_config_result.ts_config.into(),
emit_options,
file_fetcher,
graph_data: Default::default(),
lockfile,

View file

@ -11,6 +11,7 @@ FNF:4
FNH:2
BRF:0
BRH:0
DA:1,1
DA:13,1
DA:14,1
DA:15,1
@ -67,6 +68,6 @@ DA:70,1
DA:71,0
DA:73,1
DA:74,1
LH:39
LF:56
LH:40
LF:57
end_of_record

View file

@ -1,4 +1,4 @@
cover [WILDCARD]/coverage/complex.ts ... 69.643% (39/56)
cover [WILDCARD]/coverage/complex.ts ... 70.175% (40/57)
46 | export function unused(
47 | foo: string,
48 | bar: string,

View file

@ -27,10 +27,8 @@ pub async fn print_docs(
.unwrap_or_else(|| "--builtin".to_string());
let mut doc_nodes = if source_file == "--builtin" {
// todo(dsherret): change this back to deno://lib.deno.d.ts once
// https://github.com/denoland/deno_ast/issues/109 is fixed
let source_file_specifier =
ModuleSpecifier::parse("deno://dts/lib.deno.d.ts").unwrap();
ModuleSpecifier::parse("deno://lib.deno.d.ts").unwrap();
let content = get_types(ps.options.unstable());
let mut loader = deno_graph::source::MemoryLoader::new(
vec![(

View file

@ -41,5 +41,5 @@ path = "examples/http_bench_json_ops.rs"
# These dependencies are only used for the 'http_bench_*_ops' examples.
[dev-dependencies]
deno_ast = { version = "0.17.0", features = ["transpiling"] }
deno_ast = { version = "0.19.0", features = ["transpiling"] }
tokio = { version = "1.19", features = ["full"] }