Skip to content

refactor(linter/plugins): reduce repeat code from createGlobalVariable #18318

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
Jan 21, 2026
Merged

refactor(linter/plugins): reduce repeat code from createGlobalVariable #18318

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
29 changes: 9 additions & 20 deletions apps/oxlint/src-js/plugins/scope.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,40 +268,29 @@ function addGlobals(): void {
* @param isWritable - `true` if the variable is writable, `false` otherwise
*/
function createGlobalVariable(name: string, globalScope: TSScope, isWritable: boolean): void {
const implicitGlobalSetting = isWritable ? "writable" : "readonly";

// If var already exists in the scope (from code declarations or previous envs), don't create a new one.
// TS-ESLint's scope manager doesn't resolve references in the global scope for `sourceType: "script"`,
// so we mustn't overwrite local `var` declarations with globals of the same name.
// But set properties on the existing variable to indicate it's a configured global.
let variable = globalScope.set.get(name);
if (variable !== undefined) {
// @ts-expect-error - not present in types
variable.writeable = isWritable;
// @ts-expect-error - not present in types
variable.eslintImplicitGlobalSetting = implicitGlobalSetting;
// @ts-expect-error - not present in types
variable.eslintExplicitGlobal = false;
// @ts-expect-error - not present in types
variable.eslintExplicitGlobalComments = undefined;
return;
if (variable === undefined) {
variable = new TSVariable(name, globalScope);
globalScope.set.set(name, variable);
globalScope.variables.push(variable);

// All globals are type + value
debugAssert(variable.isTypeVariable, "variable should have `isTypeVariable` set by default");
debugAssert(variable.isValueVariable, "variable should have `isValueVariable` set by default");
}

// All globals are type + value
variable = new TSVariable(name, globalScope);
debugAssert(variable.isTypeVariable, "variable should have `isTypeVariable` set by default");
debugAssert(variable.isValueVariable, "variable should have `isValueVariable` set by default");
// @ts-expect-error - not present in types
variable.writeable = isWritable;
// @ts-expect-error - not present in types
variable.eslintImplicitGlobalSetting = implicitGlobalSetting;
variable.eslintImplicitGlobalSetting = isWritable ? "writable" : "readonly";
// @ts-expect-error - not present in types
variable.eslintExplicitGlobal = false;
// @ts-expect-error - not present in types
variable.eslintExplicitGlobalComments = undefined;

globalScope.set.set(name, variable);
globalScope.variables.push(variable);
}

/**
Expand Down
Loading