Skip to content

fix(coverage): apply always_strict to test262 and typescript per the specifcation #5555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Sep 6, 2024
Merged

fix(coverage): apply always_strict to test262 and typescript per the specifcation #5555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/oxc_ast/src/generated/assert_layouts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ const _: () = {
assert!(offset_of!(Span, start) == 0usize);
assert!(offset_of!(Span, end) == 4usize);

assert!(size_of::<SourceType>() == 4usize);
assert!(size_of::<SourceType>() == 3usize);
assert!(align_of::<SourceType>() == 1usize);

assert!(size_of::<Language>() == 1usize);
Expand Down Expand Up @@ -2954,7 +2954,7 @@ const _: () = {
assert!(offset_of!(Span, start) == 0usize);
assert!(offset_of!(Span, end) == 4usize);

assert!(size_of::<SourceType>() == 4usize);
assert!(size_of::<SourceType>() == 3usize);
assert!(align_of::<SourceType>() == 1usize);

assert!(size_of::<Language>() == 1usize);
Expand Down
17 changes: 2 additions & 15 deletions crates/oxc_span/src/source_type/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ impl SourceType {
language: Language::JavaScript,
module_kind: ModuleKind::Script,
variant: LanguageVariant::Standard,
always_strict: false,
}
}

Expand Down Expand Up @@ -110,7 +109,6 @@ impl SourceType {
language: Language::TypeScript,
module_kind: ModuleKind::Module,
variant: LanguageVariant::Standard,
always_strict: false,
}
}

Expand Down Expand Up @@ -150,7 +148,6 @@ impl SourceType {
language: Language::TypeScriptDefinition,
module_kind: ModuleKind::Module,
variant: LanguageVariant::Standard,
always_strict: false,
}
}

Expand Down Expand Up @@ -185,12 +182,8 @@ impl SourceType {
self.variant == LanguageVariant::Jsx
}

pub fn always_strict(self) -> bool {
self.always_strict
}

pub fn is_strict(self) -> bool {
self.is_module() || self.always_strict
self.is_module()
}

#[must_use]
Expand Down Expand Up @@ -235,12 +228,6 @@ impl SourceType {
self
}

#[must_use]
pub const fn with_always_strict(mut self, yes: bool) -> Self {
self.always_strict = yes;
self
}

/// Converts a file [`Path`] to [`SourceType`].
///
/// ## Examples
Expand Down Expand Up @@ -329,7 +316,7 @@ impl SourceType {
_ => LanguageVariant::Standard,
};

Ok(Self { language, module_kind, variant, always_strict: false })
Ok(Self { language, module_kind, variant })
}
}

Expand Down
7 changes: 1 addition & 6 deletions crates/oxc_span/src/source_type/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use oxc_ast_macros::ast;
#[cfg(feature = "serialize")]
use ::{serde::Serialize, tsify::Tsify};
use {serde::Serialize, tsify::Tsify};

/// Source Type for JavaScript vs TypeScript / Script vs Module / JSX
#[ast]
Expand All @@ -19,11 +19,6 @@ pub struct SourceType {

/// Support JSX for JavaScript and TypeScript? default without JSX
pub(super) variant: LanguageVariant,

/// Mark strict mode as always strict
///
/// See <https://github.com/tc39/test262/blob/main/INTERPRETING.md#strict-mode>
pub(super) always_strict: bool,
}

/// JavaScript or TypeScript
Expand Down
Loading