diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/Cargo.toml | 16 | ||||
| -rw-r--r-- | cli/emit.rs | 3 | ||||
| -rw-r--r-- | cli/lsp/testing/collectors.rs | 3 | ||||
| -rw-r--r-- | cli/tests/integration/repl_tests.rs | 5 | ||||
| -rw-r--r-- | cli/tests/testdata/lint/expected_json.out | 2 | ||||
| -rw-r--r-- | cli/tests/testdata/lint/without_config/malformed.js | 2 | ||||
| -rw-r--r-- | cli/tools/repl/editor.rs | 2 |
7 files changed, 16 insertions, 17 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e11550f43..db8268cdf 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -45,11 +45,11 @@ winapi = "=0.3.9" winres = "=0.1.11" [dependencies] -deno_ast = { version = "0.13.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] } +deno_ast = { version = "0.14.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] } deno_core = { version = "0.128.0", path = "../core" } -deno_doc = "0.33.0" -deno_graph = "0.25.0" -deno_lint = { version = "0.28.0", features = ["docs"] } +deno_doc = "0.34.0" +deno_graph = "0.26.0" +deno_lint = { version = "0.29.0", features = ["docs"] } deno_runtime = { version = "0.54.0", path = "../runtime" } deno_task_shell = "0.2.1" @@ -62,12 +62,12 @@ clap_complete = "=3.1.1" clap_complete_fig = "=3.1.4" data-url = "=0.1.1" dissimilar = "=1.0.2" -dprint-plugin-json = "=0.15.0" -dprint-plugin-markdown = "=0.13.0" -dprint-plugin-typescript = "=0.66.0" +dprint-plugin-json = "=0.15.1" +dprint-plugin-markdown = "=0.13.1" +dprint-plugin-typescript = "=0.67.0" encoding_rs = "=0.8.29" env_logger = "=0.8.4" -eszip = "=0.18.0" +eszip = "=0.19.0" fancy-regex = "=0.7.1" http = "=0.2.4" import_map = "=0.9.0" diff --git a/cli/emit.rs b/cli/emit.rs index c5562e1d4..809260ac0 100644 --- a/cli/emit.rs +++ b/cli/emit.rs @@ -986,8 +986,7 @@ impl Hook for BundleHook { value: Box::new(ast::Expr::Lit(ast::Lit::Str(ast::Str { span, value: module_record.file_name.to_string().into(), - kind: ast::StrKind::Synthesized, - has_escape: false, + raw: None, }))), }, ast::KeyValueProp { diff --git a/cli/lsp/testing/collectors.rs b/cli/lsp/testing/collectors.rs index 572c03726..33ad3a7ab 100644 --- a/cli/lsp/testing/collectors.rs +++ b/cli/lsp/testing/collectors.rs @@ -163,8 +163,7 @@ fn check_call_expr( ast::Expr::Tpl(tpl) => { if tpl.quasis.len() == 1 { if let Some(tpl_element) = tpl.quasis.get(0) { - maybe_name = - Some(tpl_element.raw.value.to_string()); + maybe_name = Some(tpl_element.raw.to_string()); } } } diff --git a/cli/tests/integration/repl_tests.rs b/cli/tests/integration/repl_tests.rs index edade5d92..59acc7dfb 100644 --- a/cli/tests/integration/repl_tests.rs +++ b/cli/tests/integration/repl_tests.rs @@ -79,7 +79,8 @@ fn pty_syntax_error_input() { console.write_line("close();"); let output = console.read_all_output(); - assert!(output.contains("Expected 4 hex characters")); + assert!(output + .contains("Bad character escape sequence, expected 4 hex characters")); assert!(output.contains("Unterminated string constant")); assert!(output.contains("Expected a semicolon")); }); @@ -162,7 +163,7 @@ fn pty_complete_imports() { let output = console.read_all_output(); assert!(output.contains("Hello World")); - assert!(output.contains("\ntesting output")); + assert!(output.contains("testing output\u{1b}")); }); // ensure when the directory changes that the suggestions come from the cwd diff --git a/cli/tests/testdata/lint/expected_json.out b/cli/tests/testdata/lint/expected_json.out index 876aec9e0..61680607c 100644 --- a/cli/tests/testdata/lint/expected_json.out +++ b/cli/tests/testdata/lint/expected_json.out @@ -58,7 +58,7 @@ "errors": [ { "file_path": "[WILDCARD]malformed.js", - "message": "Expected '}', got '<eof>' at [WILDCARD]malformed.js:4:16" + "message": "Expected '{', got 'B' at [WILDCARD]malformed.js:4:16" } ] } diff --git a/cli/tests/testdata/lint/without_config/malformed.js b/cli/tests/testdata/lint/without_config/malformed.js index 5ad4650d6..9b64da898 100644 --- a/cli/tests/testdata/lint/without_config/malformed.js +++ b/cli/tests/testdata/lint/without_config/malformed.js @@ -1,4 +1,4 @@ // deno-fmt-ignore-file // intentionally malformed file -export class A {
\ No newline at end of file +export class A B C
\ No newline at end of file diff --git a/cli/tools/repl/editor.rs b/cli/tools/repl/editor.rs index 825934b5e..43047e585 100644 --- a/cli/tools/repl/editor.rs +++ b/cli/tools/repl/editor.rs @@ -315,7 +315,7 @@ impl Highlighter for EditorHelper { colors::green(&line[span]).to_string() } Token::Regex(_, _) => colors::red(&line[span]).to_string(), - Token::Num(_) | Token::BigInt(_) => { + Token::Num { .. } | Token::BigInt { .. } => { colors::yellow(&line[span]).to_string() } Token::Word(word) => match word { |