merge queue: embarking main (a4df3e3) and #6961 together

apps/wing/src/commands/compile.ts

@@ -101,7 +101,7 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
       const result = [];
 
       for (const diagnostic of diagnostics) {
-        const { message, span, annotations, hints } = diagnostic;
+        const { message, span, annotations, hints, severity } = diagnostic;
         const files: File[] = [];
         const labels: Label[] = [];
 
@@ -145,7 +145,7 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
           files,
           {
             message,
-            severity: "error",
+            severity,
             labels,
             notes: hints.map((hint) => `hint: ${hint}`),
           },
@@ -156,7 +156,7 @@ export async function compile(entrypoint?: string, options?: CompileOptions): Pr
         );
         result.push(diagnosticText);
       }
-      throw new Error(result.join("\n"));
+      throw new Error(result.join("\n").trimEnd());
     } else if (error instanceof wingCompiler.PreflightError) {
       let output = await prettyPrintError(error.causedBy, {
         chalk,

libs/tree-sitter-wing/grammar.js

@@ -128,7 +128,6 @@ module.exports = grammar({
         $.struct_definition,
         $.enum_definition,
         $.try_catch_statement,
-        $.compiler_dbg_env,
         $.super_constructor_statement,
         $.throw_statement,
         $.lift_statement
@@ -377,7 +376,6 @@ module.exports = grammar({
         $.parenthesized_expression,
         $.json_literal,
         $.struct_literal,
-        $.compiler_dbg_panic,
         $.optional_unwrap,
         $.intrinsic
       ),
@@ -463,9 +461,6 @@ module.exports = grammar({
         )
       ),
 
-    compiler_dbg_panic: ($) => "😱",
-    compiler_dbg_env: ($) => seq("🗺️", optional(";")),
-
     call: ($) =>
       prec.left(
         PREC.CALL,

libs/tree-sitter-wing/test/corpus/expressions.txt

@@ -500,18 +500,6 @@ nil;
   (expression_statement
     (nil_value)))
 
-================================================================================
-Debug panic
-================================================================================
-
-😱;
-
---------------------------------------------------------------------------------
-
-(source
-  (expression_statement
-    (compiler_dbg_panic)))
-
 ================================================================================
 Duration
 ================================================================================

libs/tree-sitter-wing/test/corpus/statements/statements.txt

@@ -529,17 +529,6 @@ if let var x = y {}
       (reference_identifier))
     block: (block)))
 
-================================================================================
-Debug symbol env
-================================================================================
-
-🗺️;
-
---------------------------------------------------------------------------------
-
-(source
-  (compiler_dbg_env))
-
 ================================================================================
 Super constructor
 ================================================================================

libs/wingc/examples/compile.rs

@@ -15,9 +15,9 @@ pub fn main() {
 	let source_path = Utf8Path::new(&args[1]).canonicalize_utf8().unwrap();
 	let target_dir: Utf8PathBuf = env::current_dir().unwrap().join("target").try_into().unwrap();
 
-	let results = compile(source_path.parent().unwrap(), &source_path, None, &target_dir);
-	if results.is_err() {
-		let mut diags = get_diagnostics();
+	let _ = compile(source_path.parent().unwrap(), &source_path, None, &target_dir);
+	let mut diags = get_diagnostics();
+	if !diags.is_empty() {
 		// Sort error messages by line number (ascending)
 		diags.sort();
 		eprintln!(

libs/wingc/src/ast.rs

@@ -505,7 +505,6 @@ pub enum StmtKind {
 		catch_block: Option<CatchBlock>,
 		finally_statements: Option<Scope>,
 	},
-	CompilerDebugEnv,
 	ExplicitLift(ExplicitLift),
 }
 
@@ -677,7 +676,6 @@ pub enum ExprKind {
 		element: Box<Expr>,
 	},
 	FunctionClosure(FunctionDefinition),
-	CompilerDebugPanic,
 }
 
 #[derive(Debug)]

libs/wingc/src/comp_ctx.rs

@@ -5,7 +5,7 @@ use std::{
 
 use strum::{Display, EnumString};
 
-use crate::diagnostic::{report_diagnostic, Diagnostic, WingSpan};
+use crate::diagnostic::{report_diagnostic, Diagnostic, DiagnosticSeverity, WingSpan};
 
 /// The different phases of compilation, used for tracking compilation context
 /// for diagnostic purposes. Feel free to add new phases as needed.
@@ -64,32 +64,6 @@ impl CompilationContext {
 	}
 }
 
-/// Macro used for explicit panics if the environment variable `WINGC_DEBUG_PANIC` is set.
-/// This can be used if we want to conditionally panic in certain situations.
-/// This is a macro and not a function so we can get the location of the caller
-/// in the panic message.
-#[macro_export]
-macro_rules! dbg_panic {
-	() => {{
-		|| -> () {
-			// Get environment variable to see if we should panic or not
-			let Ok(dbg_panic) = std::env::var("WINGC_DEBUG_PANIC") else {
-				return;
-			};
-
-			if dbg_panic == "1"
-				|| dbg_panic == "true"
-				|| (dbg_panic
-					.parse::<$crate::comp_ctx::CompilationPhase>()
-					.map(|p| p == $crate::comp_ctx::CompilationContext::get_phase())
-					.unwrap_or(false))
-			{
-				panic!("User invoked panic");
-			}
-		}();
-	}};
-}
-
 pub fn set_custom_panic_hook() {
 	std::panic::set_hook(Box::new(|pi| {
 		// Print backtrace if RUST_BACKTRACE=1
@@ -109,6 +83,7 @@ pub fn set_custom_panic_hook() {
 			span: Some(CompilationContext::get_span()),
 			annotations: vec![],
 			hints: vec![],
+			severity: DiagnosticSeverity::Error,
 		})
 	}));
 }

libs/wingc/src/diagnostic.rs

@@ -281,6 +281,7 @@ pub struct Diagnostic {
 	pub annotations: Vec<DiagnosticAnnotation>,
 	pub span: Option<WingSpan>,
 	pub hints: Vec<String>,
+	pub severity: DiagnosticSeverity,
 }
 
 impl Diagnostic {
@@ -290,6 +291,7 @@ impl Diagnostic {
 			span: Some(span.span()),
 			annotations: vec![],
 			hints: vec![],
+			severity: DiagnosticSeverity::Error,
 		}
 	}
 
@@ -316,6 +318,11 @@ impl Diagnostic {
 		new
 	}
 
+	pub fn severity(mut self, level: DiagnosticSeverity) -> Self {
+		self.severity = level;
+		self
+	}
+
 	pub fn report(self) {
 		report_diagnostic(self);
 	}
@@ -336,6 +343,13 @@ impl DiagnosticAnnotation {
 	}
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum DiagnosticSeverity {
+	Error,
+	Warning,
+}
+
 impl std::fmt::Display for Diagnostic {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		if let Some(span) = &self.span {
@@ -374,7 +388,7 @@ impl PartialOrd for Diagnostic {
 }
 
 thread_local! {
-	pub static DIAGNOSTICS: RefCell<Diagnostics> = RefCell::new(Diagnostics::new());
+	static DIAGNOSTICS: RefCell<Diagnostics> = RefCell::new(Diagnostics::new());
 }
 
 /// Report a compilation diagnostic
@@ -411,7 +425,7 @@ extern "C" {
 pub fn found_errors() -> bool {
 	DIAGNOSTICS.with(|diagnostics| {
 		let diagnostics = diagnostics.borrow();
-		!diagnostics.is_empty()
+		diagnostics.iter().any(|d| d.severity == DiagnosticSeverity::Error)
 	})
 }
 

libs/wingc/src/dtsify/mod.rs

@@ -328,7 +328,6 @@ impl<'a> DTSifier<'a> {
 			| StmtKind::Assignment { .. }
 			| StmtKind::Scope(_)
 			| StmtKind::TryCatch { .. }
-			| StmtKind::CompilerDebugEnv
 			| StmtKind::ExplicitLift(_) => {}
 		}
 

libs/wingc/src/files.rs

@@ -8,7 +8,7 @@ use std::{
 
 use camino::{Utf8Path, Utf8PathBuf};
 
-use crate::diagnostic::Diagnostic;
+use crate::diagnostic::{Diagnostic, DiagnosticSeverity};
 
 #[derive(Debug)]
 pub enum FilesError {
@@ -32,6 +32,7 @@ impl From<FilesError> for Diagnostic {
 			span: None,
 			annotations: vec![],
 			hints: vec![],
+			severity: DiagnosticSeverity::Error,
 		}
 	}
 }

libs/wingc/src/fold.rs

@@ -1,11 +1,8 @@
-use crate::{
-	ast::{
-		ArgList, BringSource, CalleeKind, CatchBlock, Class, ClassField, ElifBlock, ElifLetBlock, Elifs, Enum,
-		ExplicitLift, Expr, ExprKind, FunctionBody, FunctionDefinition, FunctionParameter, FunctionSignature, IfLet,
-		Interface, InterpolatedString, InterpolatedStringPart, Intrinsic, LiftQualification, Literal, New, Reference,
-		Scope, Stmt, StmtKind, Struct, StructField, Symbol, TypeAnnotation, TypeAnnotationKind, UserDefinedType,
-	},
-	dbg_panic,
+use crate::ast::{
+	ArgList, BringSource, CalleeKind, CatchBlock, Class, ClassField, ElifBlock, ElifLetBlock, Elifs, Enum, ExplicitLift,
+	Expr, ExprKind, FunctionBody, FunctionDefinition, FunctionParameter, FunctionSignature, IfLet, Interface,
+	InterpolatedString, InterpolatedStringPart, Intrinsic, LiftQualification, Literal, New, Reference, Scope, Stmt,
+	StmtKind, Struct, StructField, Symbol, TypeAnnotation, TypeAnnotationKind, UserDefinedType,
 };
 
 /// Similar to the `visit` module in `wingc` except each method takes ownership of an
@@ -199,7 +196,6 @@ where
 			}),
 			finally_statements: finally_statements.map(|statements| f.fold_scope(statements)),
 		},
-		StmtKind::CompilerDebugEnv => StmtKind::CompilerDebugEnv,
 		StmtKind::SuperConstructor { arg_list } => StmtKind::SuperConstructor {
 			arg_list: f.fold_args(arg_list),
 		},
@@ -391,10 +387,6 @@ where
 			element: Box::new(f.fold_expr(*element)),
 		},
 		ExprKind::FunctionClosure(def) => ExprKind::FunctionClosure(f.fold_function_definition(def)),
-		ExprKind::CompilerDebugPanic => {
-			dbg_panic!(); // Handle the debug panic expression (during folding)
-			ExprKind::CompilerDebugPanic
-		}
 	};
 	Expr {
 		id: node.id,