Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.

fix(noRedeclare): allow merging namespace + variable #4772

Merged
merged 2 commits into from
Aug 19, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ export namespace Orientation {
export function f(): void {}
}

// variable and namespace merging
declare namespace bodyParser {
interface BodyParser {
/** @deprecated */
(): void
}
interface Options {
inflate?: boolean | undefined
}
}
declare const bodyParser: bodyParser.BodyParser

Conaclos marked this conversation as resolved.
Show resolved Hide resolved
// namespace merging
export namespace X {
export function f(): void {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: crates/rome_js_analyze/tests/spec_tests.rs
assertion_line: 91
assertion_line: 80
expression: valid-declaration-merging.ts
---
# Input
Expand Down Expand Up @@ -76,6 +76,18 @@ export namespace Orientation {
export function f(): void {}
}

// variable and namespace merging
declare namespace bodyParser {
interface BodyParser {
/** @deprecated */
(): void
}
interface Options {
inflate?: boolean | undefined
}
}
declare const bodyParser: bodyParser.BodyParser

// namespace merging
export namespace X {
export function f(): void {}
Expand Down
1 change: 1 addition & 0 deletions crates/rome_js_syntax/src/binding_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ impl AnyJsBindingDeclaration {
AnyJsBindingDeclaration::TsModuleDeclaration(_),
AnyJsBindingDeclaration::JsClassDeclaration(_)
| AnyJsBindingDeclaration::JsFunctionDeclaration(_)
| AnyJsBindingDeclaration::JsVariableDeclarator(_)
| AnyJsBindingDeclaration::TsDeclareFunctionDeclaration(_)
| AnyJsBindingDeclaration::TsEnumDeclaration(_)
| AnyJsBindingDeclaration::TsInterfaceDeclaration(_)
Expand Down
Loading