simplify

Author: dummdidumm

packages/svelte/src/compiler/phases/2-analyze/index.js

@@ -496,6 +496,13 @@ export function analyze_component(root, source, options) {
 		analysis.reactive_statements = order_reactive_statements(analysis.reactive_statements);
 	}
 
+	if (analysis.event_directive_node && analysis.uses_event_attributes) {
+		e.mixed_event_handler_syntaxes(
+			analysis.event_directive_node,
+			analysis.event_directive_node.name
+		);
+	}
+
 	if (analysis.uses_render_tags && (analysis.uses_slots || analysis.slot_names.size > 0)) {
 		e.slot_snippet_conflict(analysis.slot_names.values().next().value);
 	}

packages/svelte/src/compiler/phases/2-analyze/validation.js

@@ -105,18 +105,6 @@ function validate_element(node, context) {
 
 	for (const attribute of node.attributes) {
 		if (attribute.type === 'Attribute') {
-			const parent_type = node.type;
-
-			// Don't warn on component events; these might not be under the author's control so the warning would be unactionable
-			if (
-				(parent_type === 'RegularElement' || parent_type === 'SvelteElement') &&
-				is_event_attribute(attribute) &&
-				context.state.analysis.event_directive_node
-			) {
-				const { event_directive_node } = context.state.analysis;
-				e.mixed_event_handler_syntaxes(event_directive_node, event_directive_node.name);
-			}
-
 			const is_expression = is_expression_attribute(attribute);
 
 			if (context.state.analysis.runes && is_expression) {
@@ -1217,13 +1205,10 @@ export const validation_runes = merge(validation, a11y_validators, {
 			w.slot_element_deprecated(node);
 		}
 	},
-	OnDirective(node, { state, path }) {
+	OnDirective(node, { path }) {
 		const parent_type = path.at(-1)?.type;
 		// Don't warn on component events; these might not be under the author's control so the warning would be unactionable
 		if (parent_type === 'RegularElement' || parent_type === 'SvelteElement') {
-			if (state.analysis.uses_event_attributes) {
-				e.mixed_event_handler_syntaxes(node, node.name);
-			}
 			w.event_directive_deprecated(node, node.name);
 		}
 	},

packages/svelte/src/compiler/phases/types.d.ts

@@ -60,7 +60,9 @@ export interface ComponentAnalysis extends Analysis {
 	uses_render_tags: boolean;
 	needs_context: boolean;
 	needs_props: boolean;
+	/** Set to the first event directive (on:x) found on a DOM element in the code */
 	event_directive_node: OnDirective | null;
+	/** true if uses event attributes (onclick) */
 	uses_event_attributes: boolean;
 	custom_element: boolean | SvelteOptions['customElement'];
 	/** If `true`, should append styles through JavaScript */