Skip to content

Merge master into v1#1726

Merged
TwitchBronBron merged 9 commits into
v1from
merge-master-into-v1
May 29, 2026
Merged

Merge master into v1#1726
TwitchBronBron merged 9 commits into
v1from
merge-master-into-v1

Conversation

@TwitchBronBron
Copy link
Copy Markdown
Member

@TwitchBronBron TwitchBronBron commented May 29, 2026

Merges master (through 0.72.3) into v1.

Conflicts resolved

  • package.json / package-lock.json — kept v1s version (1.0.0-alpha.51, lockfileVersion 3). master only bumped the version; no new deps. Lockfile regenerated via npm install.
  • CHANGELOG.md — kept v1s alpha entries on top, inserted masters 0.72.3 entry in date order.
  • src/interfaces.ts — kept v1s renamed ValidateFileEvent / provideSemanticTokens hooks; added masters ProvideInlayHintsEvent interface + before/after hooks; dropped masters stale OnGetSemanticTokensEvent / BeforeFileValidateEvent (superseded by v1s names).
  • src/Program.ts & src/bscPlugin/BscPlugin.ts — merged import lists, wired in provideInlayHints alongside v1s provideSemanticTokens.

Feature adaptation

master added parameter-name inlay hints (#1703), written against the pre-refactor AST/plugin API. Ported InlayHintProcessor to v1s AST:

  • node.rangenode.location?.range
  • callee.namecallee.tokens.name
  • call.methodNamecall.tokens.methodName
  • param.nameparam.tokens.name
  • file.pathAbsolutefile.srcPath
  • Expression type imported from AstNode

Verification

  • npm run build — clean
  • npm run test:nocover4189 passing, 0 failing (incl. the InlayHintProcessor suite)
  • npm run lint — passes (ESLint + CRLF EOL check)

🤖 Generated with Claude Code
@

chrisdp and others added 9 commits May 20, 2026 09:20
Co-authored-by: rokucommunity-bot <93661887+rokucommunity-bot@users.noreply.github.com>
Co-authored-by: Christopher Dwyer-Perkins <chris@inverted-solutions.com>
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
#	src/Program.ts
#	src/bscPlugin/BscPlugin.ts
#	src/interfaces.ts
@TwitchBronBron TwitchBronBron merged commit bef4a54 into v1 May 29, 2026
9 checks passed
@TwitchBronBron TwitchBronBron deleted the merge-master-into-v1 branch May 29, 2026 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants