`8f633f4812e7`

1 file changed

modifiedcrates/jrsonnet-evaluator/src/trace/mod.rsdiff before after both
1mod location;1mod location;
22
3use crate::{EvaluationState, LocError};3use crate::{error::Error, EvaluationState, LocError};
4pub use location::*;4pub use location::*;
5use std::path::PathBuf;5use std::path::PathBuf;
66
87		error: &LocError,87		error: &LocError,
88	) -> Result<(), std::fmt::Error> {88	) -> Result<(), std::fmt::Error> {
89		writeln!(out, "{}", error.error())?;89		writeln!(out, "{}", error.error())?;
90		match error.error() {
91			Error::ImportSyntaxError {
92				path,
93				source_code,
94				error,
95			} => {
96				use std::fmt::Write;
97				let mut n = self.resolver.resolve(&path);
98				let mut offset = error.location.offset;
99				let mut is_eof = false;
100				if offset >= source_code.len() {
101					offset = source_code.len() - 1;
102					is_eof = true;
103				}
104				let mut location = offset_to_location(&source_code, &[offset])
105					.into_iter()
106					.next()
107					.unwrap();
108				if is_eof {
109					location.column += 1;
110				}
111
112				write!(n, ":").unwrap();
113				print_code_location(&mut n, &location, &location).unwrap();
114				write!(out, "{:<p$}{}", "", n, p = self.padding,)?;
115			}
116			_ => {}
117		}
90		let file_names = error118		let file_names = error
91			.trace()119			.trace()
92			.0120			.0
159pub struct ExplainingFormat {187pub struct ExplainingFormat {
160	pub resolver: PathResolver,188	pub resolver: PathResolver,
161}189}
162#[cfg(feature = "explaining-traces")]190#[cfg(feature = "explaining-traces")]
191impl TraceFormat for ExplainingFormat {
192	fn write_trace(
193		&self,
194		out: &mut dyn std::fmt::Write,
195		evaluation_state: &EvaluationState,
196		error: &LocError,
197	) -> Result<(), std::fmt::Error> {
198		writeln!(out, "{}", error.error())?;
199		match error.error() {
200			Error::ImportSyntaxError {
201				path,
202				source_code,
203				error,
204			} => {
205				let mut offset = error.location.offset;
206				if offset >= source_code.len() {
207					offset = source_code.len() - 1;
208				}
209				let mut location = offset_to_location(&source_code, &[offset])
210					.into_iter()
211					.next()
212					.unwrap();
213				if location.column >= 1 {
214					location.column -= 1;
215				}
216
217				self.print_snippet(
218					out,
219					&source_code,
220					&path,
221					&location,
222					&location,
223					"^ syntax error",
224				)?;
225			}
226			_ => {}
227		}
228		let trace = &error.trace();
229		for item in trace.0.iter() {
230			let desc = &item.desc;
231			let source = item.location.clone();
232			let start_end = evaluation_state.map_source_locations(&source.0, &[source.1, source.2]);
233
234			self.print_snippet(
235				out,
236				&evaluation_state.get_source(&source.0).unwrap(),
237				&source.0,
238				&start_end[0],
239				&start_end[1],
240				desc,
241			)?;
242		}
243		Ok(())
244	}
245}
246
163impl TraceFormat for ExplainingFormat {247impl ExplainingFormat {
164	fn write_trace(248	fn print_snippet(
165		&self,249		&self,
166		out: &mut dyn std::fmt::Write,250		out: &mut dyn std::fmt::Write,
167		evaluation_state: &EvaluationState,251		source: &str,
168		error: &LocError,252		origin: &PathBuf,
253		start: &CodeLocation,
254		end: &CodeLocation,
255		desc: &str,
169	) -> Result<(), std::fmt::Error> {256	) -> Result<(), std::fmt::Error> {
170		use annotate_snippets::{257		use annotate_snippets::{
171			display_list::{DisplayList, FormatOptions},258			display_list::{DisplayList, FormatOptions},
172			snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},259			snippet::{AnnotationType, Slice, Snippet, SourceAnnotation},
173		};260		};
174		writeln!(out, "{}", error.error())?;261
175		let trace = &error.trace();262		let source_fragment: String = source
176		for item in trace.0.iter() {263			.chars()
177			let desc = &item.desc;264			.skip(start.line_start_offset)
178			let source = item.location.clone();265			.take(end.line_end_offset - end.line_start_offset)
179			let start_end = evaluation_state.map_source_locations(&source.0, &[source.1, source.2]);266			.collect();
180
181			let source_fragment: String = evaluation_state
182				.get_source(&source.0)
183				.unwrap()
184				.chars()
185				.skip(start_end[0].line_start_offset)
186				.take(start_end[1].line_end_offset - start_end[0].line_start_offset)
187				.collect();
188267
189			let origin = self.resolver.resolve(&source.0);268		let origin = self.resolver.resolve(&origin);
190			let snippet = Snippet {269		let snippet = Snippet {
191				opt: FormatOptions {270			opt: FormatOptions {
192					color: true,271				color: true,
196				footer: vec![],275			footer: vec![],
197				slices: vec![Slice {276			slices: vec![Slice {
198					source: &source_fragment,277				source: &source_fragment,
199					line_start: start_end[0].line,278				line_start: start.line,
200					origin: Some(&origin),279				origin: Some(&origin),
201					fold: false,280				fold: false,
202					annotations: vec![SourceAnnotation {281				annotations: vec![SourceAnnotation {
203						label: desc,282					label: desc,
204						annotation_type: AnnotationType::Error,283					annotation_type: AnnotationType::Error,
205						range: (284					range: (
206							source.1 - start_end[0].line_start_offset,285						start.offset - start.line_start_offset,
207							source.2 - start_end[0].line_start_offset,286						end.offset - start.line_start_offset,
208						),287					),
209					}],288				}],
210				}],289			}],
211			};290		};
212291
213			let dl = DisplayList::from(snippet);292		let dl = DisplayList::from(snippet);
214			writeln!(out, "{}", dl)?;293		writeln!(out, "{}", dl)?;
215		}294
216		Ok(())295		Ok(())
217	}296	}
218}297}