Unverified Commit 3e1bdb42 authored by Luke Sandberg's avatar Luke Sandberg Committed by GitHub

[turbopack] Remove the `issue_path` feature and related functionality (#83920)

This has been disabled for a long time and is superceeded by ImportTraces
parent 7cc4990f
......@@ -16,7 +16,8 @@ use turbo_tasks_fs::FileContent;
use turbopack_core::{
diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
issue::{
IssueDescriptionExt, IssueSeverity, PlainIssue, PlainIssueSource, PlainSource, StyledString,
CollectibleIssuesExt, IssueSeverity, PlainIssue, PlainIssueSource, PlainSource,
StyledString,
},
source_pos::SourcePos,
};
......@@ -101,7 +102,7 @@ pub fn root_task_dispose(
}
pub async fn get_issues<T: Send>(source: OperationVc<T>) -> Result<Arc<Vec<ReadRef<PlainIssue>>>> {
let issues = source.peek_issues_with_path().await?;
let issues = source.peek_issues().await?;
Ok(Arc::new(issues.get_plain_issues().await?))
}
......
......@@ -5,7 +5,7 @@ use turbo_tasks::{
CollectiblesSource, FxIndexMap, NonLocalValue, OperationValue, OperationVc, ResolvedVc,
TaskInput, Vc, debug::ValueDebugFormat, get_effects, trace::TraceRawVcs,
};
use turbopack_core::{diagnostics::Diagnostic, issue::IssueDescriptionExt};
use turbopack_core::{diagnostics::Diagnostic, issue::CollectibleIssuesExt};
use crate::{
entrypoints::Entrypoints,
......@@ -38,7 +38,7 @@ async fn entrypoints_without_collectibles_operation(
) -> Result<Vc<Entrypoints>> {
let _ = entrypoints.resolve_strongly_consistent().await?;
let _ = entrypoints.take_collectibles::<Box<dyn Diagnostic>>();
let _ = entrypoints.take_issues_with_path().await?;
let _ = entrypoints.take_issues().await?;
let _ = get_effects(entrypoints).await?;
Ok(entrypoints.connect())
}
......
......@@ -58,7 +58,7 @@ use turbopack_core::{
file_source::FileSource,
ident::Layer,
issue::{
Issue, IssueDescriptionExt, IssueExt, IssueSeverity, IssueStage, OptionStyledString,
CollectibleIssuesExt, Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString,
StyledString,
},
module::Module,
......@@ -960,7 +960,7 @@ impl Project {
async move {
let module_graphs_op = whole_app_module_graph_operation(self);
let module_graphs_vc = module_graphs_op.resolve_strongly_consistent().await?;
let _ = module_graphs_op.take_issues_with_path().await?;
let _ = module_graphs_op.take_issues().await?;
// At this point all modules have been computed and we can get rid of the node.js
// process pools
......
......@@ -12,11 +12,11 @@ use crossterm::style::{StyledContent, Stylize};
use owo_colors::{OwoColorize as _, Style};
use rustc_hash::{FxHashMap, FxHashSet};
use turbo_rcstr::RcStr;
use turbo_tasks::{RawVc, ReadRef, TransientInstance, TransientValue, Vc};
use turbo_tasks::{RawVc, TransientInstance, TransientValue, Vc};
use turbo_tasks_fs::{FileLinesContent, source_context::get_source_context};
use turbopack_core::issue::{
CapturedIssues, IssueReporter, IssueSeverity, PlainIssue, PlainIssueProcessingPathItem,
PlainIssueSource, PlainTraceItem, StyledString,
CapturedIssues, IssueReporter, IssueSeverity, PlainIssue, PlainIssueSource, PlainTraceItem,
StyledString,
};
use crate::source_context::format_source_context_lines;
......@@ -44,39 +44,6 @@ fn format_source_content(source: &PlainIssueSource, formatted_issue: &mut String
}
}
fn format_optional_path(
path: &Option<Vec<ReadRef<PlainIssueProcessingPathItem>>>,
formatted_issue: &mut String,
) -> Result<()> {
if let Some(path) = path {
let mut last_context = None;
for item in path.iter().rev() {
let PlainIssueProcessingPathItem {
file_path: ref context,
ref description,
} = **item;
if let Some(context) = context {
let option_context = Some(context.clone());
if last_context == option_context {
writeln!(formatted_issue, " at {description}")?;
} else {
writeln!(
formatted_issue,
" at {} ({})",
context.to_string().bright_blue(),
description
)?;
last_context = option_context;
}
} else {
writeln!(formatted_issue, " at {description}")?;
last_context = None;
}
}
}
Ok(())
}
pub fn format_issue(
plain_issue: &PlainIssue,
path: Option<String>,
......@@ -435,7 +402,6 @@ impl IssueReporter for ConsoleUi {
let context_path =
make_relative_to_cwd(&plain_issue.file_path, project_dir, current_dir);
let stage = plain_issue.stage.to_string();
let processing_path = &*plain_issue.processing_path;
let severity_map = grouped_issues.entry(severity).or_default();
let category_map = severity_map.entry(stage.clone()).or_default();
let issues = category_map.entry(context_path.to_string()).or_default();
......@@ -462,7 +428,6 @@ impl IssueReporter for ConsoleUi {
if !documentation_link.is_empty() {
writeln!(&mut styled_issue, "\ndocumentation: {documentation_link}")?;
}
format_optional_path(processing_path, &mut styled_issue)?;
}
issues.push(styled_issue);
}
......
......@@ -54,4 +54,3 @@ turbo-tasks-backend = { workspace = true }
[features]
default = []
issue_path = []
......@@ -2,10 +2,7 @@ use anyhow::Result;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{
introspect::{Introspectable, IntrospectableChildren},
issue::IssueDescriptionExt,
};
use turbopack_core::introspect::{Introspectable, IntrospectableChildren};
use super::{
ContentSource, ContentSourceContent, ContentSourceData, ContentSourceDataVary, ContentSources,
......@@ -55,10 +52,7 @@ impl ContentSource for IssueFilePathContentSource {
#[turbo_tasks::function]
async fn get_routes(self: ResolvedVc<Self>) -> Result<Vc<RouteTree>> {
let this = self.await?;
let routes = content_source_get_routes_operation(this.source)
.issue_file_path(this.file_path.clone(), &*this.description)
.await?
.connect();
let routes = this.source.get_routes();
Ok(routes.map_routes(Vc::upcast(
IssueContextContentSourceMapper { source: self }.cell(),
)))
......@@ -70,13 +64,6 @@ impl ContentSource for IssueFilePathContentSource {
}
}
#[turbo_tasks::function(operation)]
fn content_source_get_routes_operation(
source: ResolvedVc<Box<dyn ContentSource>>,
) -> Vc<RouteTree> {
source.get_routes()
}
#[turbo_tasks::value]
struct IssueContextContentSourceMapper {
source: ResolvedVc<IssueFilePathContentSource>,
......@@ -109,41 +96,15 @@ struct IssueContextGetContentSourceContent {
impl GetContentSourceContent for IssueContextGetContentSourceContent {
#[turbo_tasks::function]
async fn vary(&self) -> Result<Vc<ContentSourceDataVary>> {
let source = self.source.await?;
Ok(get_content_source_vary_operation(self.get_content)
.issue_file_path(source.file_path.clone(), &*source.description)
.await?
.connect())
Ok(self.get_content.vary())
}
#[turbo_tasks::function]
async fn get(&self, path: RcStr, data: ContentSourceData) -> Result<Vc<ContentSourceContent>> {
let source = self.source.await?;
Ok(
get_content_source_get_operation(self.get_content, path, data)
.issue_file_path(source.file_path.clone(), &*source.description)
.await?
.connect(),
)
Ok(self.get_content.get(path, data))
}
}
#[turbo_tasks::function(operation)]
fn get_content_source_vary_operation(
get_content: ResolvedVc<Box<dyn GetContentSourceContent>>,
) -> Vc<ContentSourceDataVary> {
get_content.vary()
}
#[turbo_tasks::function(operation)]
fn get_content_source_get_operation(
get_content: ResolvedVc<Box<dyn GetContentSourceContent>>,
path: RcStr,
data: ContentSourceData,
) -> Vc<ContentSourceContent> {
get_content.get(path, data)
}
#[turbo_tasks::value_impl]
impl Introspectable for IssueFilePathContentSource {
#[turbo_tasks::function]
......
......@@ -14,8 +14,8 @@ use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack_core::{
error::PrettyPrintError,
issue::{
Issue, IssueDescriptionExt, IssueSeverity, IssueStage, OptionIssueProcessingPathItems,
OptionStyledString, PlainIssue, StyledString,
CollectibleIssuesExt, Issue, IssueSeverity, IssueStage, OptionStyledString, PlainIssue,
StyledString,
},
server_fs::ServerFileSystem,
version::{
......@@ -88,7 +88,7 @@ impl GetContentFn {
}
async fn peek_issues<T: Send>(source: OperationVc<T>) -> Result<Vec<ReadRef<PlainIssue>>> {
let captured = source.peek_issues_with_path().await?;
let captured = source.peek_issues().await?;
captured.get_plain_issues().await
}
......@@ -137,7 +137,6 @@ async fn get_update_stream_item_operation(
.cell(),
),
None,
OptionIssueProcessingPathItems::none(),
)
.await?,
);
......
......@@ -11,8 +11,8 @@ use turbopack_core::{
asset::{Asset, AssetContent},
ident::AssetIdent,
issue::{
Issue, IssueDescriptionExt, IssueExt, IssueSource, IssueStage, OptionIssueSource,
OptionStyledString, StyledString,
Issue, IssueExt, IssueSource, IssueStage, OptionIssueSource, OptionStyledString,
StyledString,
},
source::Source,
source_pos::SourcePos,
......@@ -117,22 +117,11 @@ impl Source for MdxTransformedAsset {
#[turbo_tasks::value_impl]
impl Asset for MdxTransformedAsset {
#[turbo_tasks::function]
async fn content(self: ResolvedVc<Self>) -> Result<Vc<AssetContent>> {
let this = self.await?;
Ok(*transform_process_operation(self)
.issue_file_path(this.source.ident().path().owned().await?, "MDX processing")
.await?
.connect()
.await?
.content)
async fn content(self: Vc<Self>) -> Result<Vc<AssetContent>> {
Ok(*self.process().await?.content)
}
}
#[turbo_tasks::function(operation)]
fn transform_process_operation(asset: ResolvedVc<MdxTransformedAsset>) -> Vc<MdxTransformResult> {
asset.process()
}
#[turbo_tasks::value_impl]
impl MdxTransformedAsset {
#[turbo_tasks::function]
......
......@@ -16,7 +16,6 @@ use turbopack_core::{
context::{AssetContext, ProcessResult},
file_source::FileSource,
ident::AssetIdent,
issue::IssueDescriptionExt,
reference_type::{EntryReferenceSubType, InnerAssets, ReferenceType},
resolve::{FindContextFileResult, find_context_file_or_package_key, options::ImportMapping},
source::Source,
......@@ -165,27 +164,11 @@ impl Source for PostCssTransformedAsset {
#[turbo_tasks::value_impl]
impl Asset for PostCssTransformedAsset {
#[turbo_tasks::function]
async fn content(self: ResolvedVc<Self>) -> Result<Vc<AssetContent>> {
let this = self.await?;
Ok(*transform_process_operation(self)
.issue_file_path(
this.source.ident().path().owned().await?,
"PostCSS processing",
)
.await?
.connect()
.await?
.content)
async fn content(self: Vc<Self>) -> Result<Vc<AssetContent>> {
Ok(*self.process().await?.content)
}
}
#[turbo_tasks::function(operation)]
fn transform_process_operation(
asset: ResolvedVc<PostCssTransformedAsset>,
) -> Vc<ProcessPostCssResult> {
asset.process()
}
#[turbo_tasks::value]
struct ProcessPostCssResult {
content: ResolvedVc<AssetContent>,
......
......@@ -33,7 +33,7 @@ turbo-tasks-fs = { workspace = true }
turbo-tasks-backend = { workspace = true }
turbo-unix-path = { workspace = true }
turbopack-browser = { workspace = true, features = ["test"] }
turbopack-core = { workspace = true, features = ["issue_path"] }
turbopack-core = { workspace = true }
turbopack-ecmascript-plugins = { workspace = true, features = [
"transform_emotion",
] }
......
......@@ -39,7 +39,7 @@ use turbopack_core::{
environment::{Environment, ExecutionEnvironment, NodeJsEnvironment},
file_source::FileSource,
ident::Layer,
issue::IssueDescriptionExt,
issue::CollectibleIssuesExt,
module_graph::{
ModuleGraph, chunk_group_info::ChunkGroupEntry, export_usage::compute_export_usage_info,
},
......@@ -563,7 +563,7 @@ async fn snapshot_issues(
let PreparedTest { path, .. } = &*prepared_test.await?;
let _ = run_result_op.resolve_strongly_consistent().await;
let captured_issues = run_result_op.peek_issues_with_path().await?;
let captured_issues = run_result_op.peek_issues().await?;
let plain_issues = captured_issues.get_plain_issues().await?;
......
......@@ -41,7 +41,7 @@ use turbopack_core::{
file_source::FileSource,
free_var_references,
ident::Layer,
issue::IssueDescriptionExt,
issue::CollectibleIssuesExt,
module::Module,
module_graph::{
ModuleGraph,
......@@ -217,7 +217,7 @@ async fn run(resource: PathBuf) -> Result<()> {
async fn run_inner_operation(resource: RcStr) -> Result<()> {
let out_op = run_test_operation(resource);
let out_vc = out_op.resolve_strongly_consistent().await?.owned().await?;
let captured_issues = out_op.peek_issues_with_path().await?;
let captured_issues = out_op.peek_issues().await?;
let plain_issues = captured_issues.get_plain_issues().await?;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment