summaryrefslogtreecommitdiff
path: root/cli/tests/integration
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2021-09-13 20:19:10 +0200
committerGitHub <noreply@github.com>2021-09-13 20:19:10 +0200
commit0dbeb774ba9ea618ff1e92b63ab31e5caf3003dd (patch)
tree592244102cf046716acbb144233586c312ee7a7e /cli/tests/integration
parenta655a0f3e4201840eda94938fc8d6222c2b94a99 (diff)
feat(fmt): add support for configuration file (#11944)
This commit adds support for configuration file for "deno fmt" subcommand. It is also respected by LSP when formatting files. Example configuration: { "fmt": { "files": { "include": ["src/"], "exclude": ["src/testdata/"] }, "options": { "useTabs": true, "lineWidth": 80, "indentWidth": 4, "singleQuote": true, "textWrap": "preserve" } } }
Diffstat (limited to 'cli/tests/integration')
-rw-r--r--cli/tests/integration/fmt_tests.rs31
-rw-r--r--cli/tests/integration/lsp_tests.rs163
2 files changed, 190 insertions, 4 deletions
diff --git a/cli/tests/integration/fmt_tests.rs b/cli/tests/integration/fmt_tests.rs
index 00565a5d0..2d7451694 100644
--- a/cli/tests/integration/fmt_tests.rs
+++ b/cli/tests/integration/fmt_tests.rs
@@ -129,25 +129,25 @@ fn fmt_ignore_unexplicit_files() {
}
itest!(fmt_check_tests_dir {
- args: "fmt --check ./ --ignore=.test_coverage",
+ args: "fmt --check ./ --ignore=.test_coverage,fmt/fmt_with_config/",
output: "fmt/expected_fmt_check_tests_dir.out",
exit_code: 1,
});
itest!(fmt_quiet_check_fmt_dir {
- args: "fmt --check --quiet fmt/",
+ args: "fmt --check --quiet fmt/regular/",
output_str: Some(""),
exit_code: 0,
});
itest!(fmt_check_formatted_files {
- args: "fmt --check fmt/formatted1.js fmt/formatted2.ts fmt/formatted3.md fmt/formatted4.jsonc",
+ args: "fmt --check fmt/regular/formatted1.js fmt/regular/formatted2.ts fmt/regular/formatted3.md fmt/regular/formatted4.jsonc",
output: "fmt/expected_fmt_check_formatted_files.out",
exit_code: 0,
});
itest!(fmt_check_ignore {
- args: "fmt --check --ignore=fmt/formatted1.js fmt/",
+ args: "fmt --check --ignore=fmt/regular/formatted1.js fmt/regular/",
output: "fmt/expected_fmt_check_ignore.out",
exit_code: 0,
});
@@ -181,3 +181,26 @@ itest!(fmt_stdin_check_not_formatted {
input: Some("const a = 1\n"),
output_str: Some("Not formatted stdin\n"),
});
+
+itest!(fmt_with_config {
+ args: "fmt --config fmt/deno.jsonc fmt/fmt_with_config/",
+ output: "fmt/fmt_with_config.out",
+});
+
+// Check if CLI flags take precedence
+itest!(fmt_with_config_and_flags {
+ args: "fmt --config fmt/deno.jsonc --ignore=fmt/fmt_with_config/a.ts,fmt/fmt_with_config/b.ts",
+ output: "fmt/fmt_with_config_and_flags.out",
+});
+
+itest!(fmt_with_malformed_config {
+ args: "fmt --config fmt/deno.malformed.jsonc",
+ output: "fmt/fmt_with_malformed_config.out",
+ exit_code: 1,
+});
+
+itest!(fmt_with_malformed_config2 {
+ args: "fmt --config fmt/deno.malformed2.jsonc",
+ output: "fmt/fmt_with_malformed_config2.out",
+ exit_code: 1,
+});
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index 1b8d35108..3d87c222d 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -3197,6 +3197,169 @@ fn lsp_format_markdown() {
}
#[test]
+fn lsp_format_with_config() {
+ let temp_dir = TempDir::new().expect("could not create temp dir");
+ let mut params: lsp::InitializeParams =
+ serde_json::from_value(load_fixture("initialize_params.json")).unwrap();
+ let deno_fmt_jsonc =
+ serde_json::to_vec_pretty(&load_fixture("deno.fmt.jsonc")).unwrap();
+ fs::write(temp_dir.path().join("deno.fmt.jsonc"), deno_fmt_jsonc).unwrap();
+
+ params.root_uri = Some(Url::from_file_path(temp_dir.path()).unwrap());
+ if let Some(Value::Object(mut map)) = params.initialization_options {
+ map.insert("config".to_string(), json!("./deno.fmt.jsonc"));
+ params.initialization_options = Some(Value::Object(map));
+ }
+
+ let deno_exe = deno_exe_path();
+ let mut client = LspClient::new(&deno_exe).unwrap();
+ client
+ .write_request::<_, _, Value>("initialize", params)
+ .unwrap();
+
+ client
+ .write_notification(
+ "textDocument/didOpen",
+ json!({
+ "textDocument": {
+ "uri": "file:///a/file.ts",
+ "languageId": "typescript",
+ "version": 1,
+ "text": "export async function someVeryLongFunctionName() {\nconst response = fetch(\"http://localhost:4545/some/non/existent/path.json\");\nconsole.log(response.text());\nconsole.log(\"finished!\")\n}"
+ }
+ }),
+ )
+ .unwrap();
+
+ // The options below should be ignored in favor of configuration from config file.
+ let (maybe_res, maybe_err) = client
+ .write_request::<_, _, Value>(
+ "textDocument/formatting",
+ json!({
+ "textDocument": {
+ "uri": "file:///a/file.ts"
+ },
+ "options": {
+ "tabSize": 2,
+ "insertSpaces": true
+ }
+ }),
+ )
+ .unwrap();
+
+ assert!(maybe_err.is_none());
+ assert_eq!(
+ maybe_res,
+ Some(json!([{
+ "range": {
+ "start": {
+ "line": 1,
+ "character": 0
+ },
+ "end": {
+ "line": 1,
+ "character": 0
+ }
+ },
+ "newText": "\t"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 1,
+ "character": 23
+ },
+ "end": {
+ "line": 1,
+ "character": 24
+ }
+ },
+ "newText": "\n\t\t'"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 1,
+ "character": 73
+ },
+ "end": {
+ "line": 1,
+ "character": 74
+ }
+ },
+ "newText": "',\n\t"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 2,
+ "character": 0
+ },
+ "end": {
+ "line": 2,
+ "character": 0
+ }
+ },
+ "newText": "\t"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 3,
+ "character": 0
+ },
+ "end": {
+ "line": 3,
+ "character": 0
+ }
+ },
+ "newText": "\t"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 3,
+ "character": 12
+ },
+ "end": {
+ "line": 3,
+ "character": 13
+ }
+ },
+ "newText": "'"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 3,
+ "character": 22
+ },
+ "end": {
+ "line": 3,
+ "character": 24
+ }
+ },
+ "newText": "');"
+ },
+ {
+ "range": {
+ "start": {
+ "line": 4,
+ "character": 1
+ },
+ "end": {
+ "line": 4,
+ "character": 1
+ }
+ },
+ "newText": "\n"
+ }]
+ ))
+ );
+ shutdown(&mut client);
+}
+
+#[test]
fn lsp_markdown_no_diagnostics() {
let mut client = init("initialize_params.json");
client