Skip to content

Repository navigation

fix: align initializer context and unary plus acceptance with OverPy #678

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
e54-bot merged 5 commits into from
Oct 29, 2026
Merged

fix: align initializer context and unary plus acceptance with OverPy #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf71af7
fix(semantics): reject eventPlayer in global initializers
Teakowa Oct 29, 2026
b33fb6c
fix(parser): accept unary plus with upstream precedence
Teakowa Oct 29, 2026
e73e5d6
fix(semantics): validate global initializer definitions
Teakowa Oct 29, 2026
e1e4e1d
fix(parser): allow repeated unary plus assignment targets
Teakowa Oct 29, 2026
d9d0eda
fix: separate initializer constant and macro identities (#673)
Teakowa Oct 29, 2026
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
199 changes: 3 additions & 196 deletions crates/opy-provider/src/edits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,203 +14,10 @@ use crate::{
path_to_file_uri, resolved_path, same_path, validate_documents,
};

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum DiagnosticClass {
DocumentSyntax,
MissingSource,
NameBinding,
MergedTable,
MacroTable,
Script,
ExternalFile,
Catalog,
Capability,
Semantic,
Internal,
WarningOnly,
}

const CODE_CLASSES: &[(DiagnosticClass, &[&str])] = &[
(
DiagnosticClass::DocumentSyntax,
&[
"lex-error",
"parse-error",
"workshop-source",
"directive-invalid",
"unsupported-directive",
"include-invalid",
"define-invalid",
"main-file-invalid",
"main-file-placement",
"rule-prefix-invalid",
"settings-invalid",
"settings-placement",
"macro-invalid",
"do-while-placement",
"invalid-string-entity",
"unknown-string-entity",
"script-invalid",
"enum-increment",
],
),
(
DiagnosticClass::MissingSource,
&[
"include-not-found",
"main-file-not-found",
"script-not-found",
"unknown-identifier",
"unknown-action",
"unknown-value",
"unknown-member",
],
),
(
DiagnosticClass::NameBinding,
&[
"duplicate-argument",
"duplicate-declaration",
"duplicate-definition",
"duplicate-rule-name",
"enum-type-without-member",
"invalid-arity",
"vect-arity",
"unresolved-reference",
"unknown-keyword",
],
),
(
DiagnosticClass::MergedTable,
&[
"rule-prefix-template-duplicate",
"replacement-duplicate",
"post-compile-hook-duplicate",
"macro-redeclaration",
],
),
(
DiagnosticClass::MacroTable,
&["macro-arity", "macro-recursion"],
),
(
DiagnosticClass::Script,
&[
"script-error",
"script-timeout",
"script-stack-limit",
"script-memory-limit",
"script-result-not-string",
"script-internal",
],
),
(
DiagnosticClass::ExternalFile,
&[
"include-cycle",
"settings-not-found",
"translations-invalid",
"settings-expression",
"rule-prefix-template-invalid",
],
),
(
DiagnosticClass::Catalog,
&[
"catalog-error",
"manifest-error",
"unknown-enum-member",
"missing-mapping",
"unknown-texture-member",
],
),
(
DiagnosticClass::Capability,
&[
"backend-directive-unsupported",
"four-dimensional-assignment",
"four-dimensional-delete",
"index-collision",
"index-exhausted",
"index-out-of-range",
"random-indexed-delete",
"split-dict-array-arguments",
"split-dict-array-arity",
"split-dict-array-key",
"symbol-collision",
"workshop-action-layout",
"unsupported-action-call",
"unsupported-construct",
"unsupported-control-flow",
"unsupported-dangling",
"unsupported-duplicate-name",
"unsupported-enum-domain",
"unsupported-enum-domain-mismatch",
"unsupported-enum-member",
"unsupported-index",
"unsupported-indexed-initializer",
"unsupported-integration-surface",
"unsupported-invalid-argument",
"unsupported-invalid-arity",
"unsupported-localized-string",
"unsupported-member",
"unsupported-member-assignment",
"unsupported-missing-argument",
"unsupported-modify-op",
"unsupported-non-finite-number",
"unsupported-rule-order",
"unsupported-settings",
"unsupported-subroutine-value",
"unsupported-value-call",
],
),
(
DiagnosticClass::Semantic,
&[
"action-in-value-position",
"break-context",
"continue-context",
"dict-access",
"invalid-argument",
"invalid-call-context",
"invalid-identifier",
"invalid-iterable",
"invalid-range-binder",
"invalid-receiver",
"invalid-span",
"invalid-string-modifier",
"invalid-structure",
"keyword-required",
"keyword-unsupported",
"lambda-context",
"missing-argument",
"positional-after-keyword",
"settings-hero-lists",
"settings-workshop-value",
"tabular-arguments",
"value-in-action-position",
],
),
(
DiagnosticClass::Internal,
&[
"incompatible-protocol",
"malformed-payload",
"unsupported-node",
"workshop-emission",
],
),
(DiagnosticClass::WarningOnly, &["unknown-setting"]),
];

fn class_of(code: &str) -> Option<DiagnosticClass> {
CODE_CLASSES
.iter()
.find_map(|(class, codes)| codes.contains(&code).then_some(*class))
}

mod diagnostics;
#[cfg(test)]
const NON_DIAGNOSTIC_LITERALS: &[&str] = &["kebab-case", "non-empty"];
use diagnostics::{CODE_CLASSES, NON_DIAGNOSTIC_LITERALS};
use diagnostics::{DiagnosticClass, class_of};

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
Loading
Loading