fix: rome check via standard in

rome · May 9, 2023 · b8f8a08 · b8f8a08
1 parent 4d4d87a
commit b8f8a08
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 14 deletions.
diff --git a/crates/rome_cli/src/execute/mod.rs b/crates/rome_cli/src/execute/mod.rs
@@ -34,6 +34,7 @@ impl Execution {
     }
 }
 
+#[derive(Debug)]
 pub(crate) enum TraversalMode {
     /// This mode is enabled when running the command `rome check`
     Check {
@@ -207,7 +208,7 @@ pub(crate) fn execute_mode(
     // don't do any traversal if there's some content coming from stdin
     if let Some((path, content)) = mode.as_stdin_file() {
         let rome_path = RomePath::new(path);
-        std_in::run(session, &mode, rome_path, content.as_str())
+        std_in::run(session, &mode, rome_path, content.as_str(), &cli_options)
     } else if let TraversalMode::Migrate {
         write,
         configuration_path,

diff --git a/crates/rome_cli/src/execute/std_in.rs b/crates/rome_cli/src/execute/std_in.rs
@@ -5,9 +5,13 @@ use crate::{CliDiagnostic, CliSession};
 use rome_console::{markup, ConsoleExt};
 use rome_fs::RomePath;
 
+use crate::cli_options::CliOptions;
+use crate::execute::diagnostics::{ContentDiffAdvice, FormatDiffDiagnostic};
+use rome_diagnostics::{PrintDiagnostic, MAXIMUM_DISPLAYABLE_DIAGNOSTICS};
 use rome_service::workspace::{
     ChangeFileParams, FeatureName, FeaturesBuilder, FixFileParams, FormatFileParams, Language,
-    OpenFileParams, OrganizeImportsParams, SupportsFeatureParams,
+    OpenFileParams, OrganizeImportsParams, PullDiagnosticsParams, RuleCategories,
+    SupportsFeatureParams,
 };
 use std::borrow::Cow;
 
@@ -16,6 +20,7 @@ pub(crate) fn run<'a>(
     mode: &'a Execution,
     rome_path: RomePath,
     content: &'a str,
+    cli_options: &CliOptions,
 ) -> Result<(), CliDiagnostic> {
     let workspace = &*session.app.workspace;
     let console = &mut *session.app.console;
@@ -47,6 +52,7 @@ pub(crate) fn run<'a>(
                 })
         }
     } else if mode.is_check() {
+        let mut diagnostics = Vec::new();
         let mut new_content = Cow::Borrowed(content);
 
         workspace.open_file(OpenFileParams {
@@ -96,25 +102,54 @@ pub(crate) fn run<'a>(
                 }
             }
         }
+
+        if !mode.is_check_apply_unsafe() {
+            let result = workspace.pull_diagnostics(PullDiagnosticsParams {
+                categories: RuleCategories::LINT | RuleCategories::SYNTAX,
+                path: rome_path.clone(),
+                max_diagnostics: cli_options
+                    .max_diagnostics
+                    .unwrap_or(MAXIMUM_DISPLAYABLE_DIAGNOSTICS)
+                    as u64,
+            })?;
+            diagnostics.extend(result.diagnostics);
+        }
+
         if file_features.supports_for(&FeatureName::Format) {
-            let printed = workspace.format_file(FormatFileParams { path: rome_path })?;
-            if printed.as_code() != new_content {
-                new_content = Cow::Owned(printed.into_code());
+            let printed = workspace.format_file(FormatFileParams {
+                path: rome_path.clone(),
+            })?;
+            if mode.is_check_apply() || mode.is_check_apply_unsafe() {
+                if printed.as_code() != new_content {
+                    new_content = Cow::Owned(printed.into_code());
+                }
+            } else {
+                let diagnostic = FormatDiffDiagnostic {
+                    file_name: &*rome_path.display().to_string(),
+                    diff: ContentDiffAdvice {
+                        new: printed.as_code(),
+                        old: &content,
+                    },
+                };
+                diagnostics.push(rome_diagnostics::serde::Diagnostic::new(diagnostic));
             }
         }
 
         match new_content {
-            Cow::Borrowed(original) => {
-                console.append(markup! {
-                    {original}
-                });
-            }
+            Cow::Borrowed(_) => {}
             Cow::Owned(new_content) => {
                 console.append(markup! {
                     {new_content}
                 });
             }
         }
+        if !diagnostics.is_empty() {
+            for diag in diagnostics {
+                console.error(markup! {
+                    {PrintDiagnostic::simple(&diag)}
+                })
+            }
+        }
     }
     Ok(())
 }
diff --git a/website/src/playground/tabs/SettingsTab.tsx b/website/src/playground/tabs/SettingsTab.tsx
@@ -427,7 +427,7 @@ function SyntaxSettings({
 
 	return (
 		<>
-			<h2>Syntax</h2>
+			<h2>Syntax options</h2>
 			<section>
 				<div className="field-row">
 					<label htmlFor="sourceType">Source Type</label>
@@ -527,7 +527,7 @@ function FormatterSettings({
 }) {
 	return (
 		<>
-			<h2>Formatter</h2>
+			<h2>Formatter options</h2>
 			<section>
 				<LineWidthInput lineWidth={lineWidth} setLineWidth={setLineWidth} />
 
@@ -631,7 +631,7 @@ function LinterSettings({
 }) {
 	return (
 		<>
-			<h2>Linter</h2>
+			<h2>Linter options</h2>
 			<section>
 				<div className="field-row">
 					<input
@@ -671,7 +671,7 @@ export function ImportSortingSettings({
 }) {
 	return (
 		<>
-			<h2>Import sorting</h2>
+			<h2>Import sorting options</h2>
 			<section>
 				<div className="field-row">
 					<input