Skip to content

JS: Fix semantic merge conflict: Implement new signature members in StepInputSig - #18513

Merged
redsun82 merged 1 commit into
github:mainfrom
asgerf:js/fix-flow-summary-spec
Jan 16, 2025
Merged

JS: Fix semantic merge conflict: Implement new signature members in StepInputSig#18513
redsun82 merged 1 commit into
github:mainfrom
asgerf:js/fix-flow-summary-spec

Conversation

@asgerf

@asgerfasgerf commented Jan 16, 2025

Copy link
Copy Markdown
Contributor

Fixes a semantic merge conflict between #18467 and #18298

@asgerf
asgerf marked this pull request as ready for review January 16, 2025 12:47
CopilotAI review requested due to automatic review settings January 16, 2025 12:47
@asgerf
asgerf requested a review from a team as a code ownerJanuary 16, 2025 12:47

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

Files not reviewed (1)
  • javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll: Language not supported

Tip: Copilot only keeps its highest confidence comments to reduce noise and keep you focused. Learn more

@asgerfasgerf added the no-change-note-required This PR does not need a change note label Jan 16, 2025
*/
class SummarizedCallableBase = string;

class SourceBase extends Unit {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively, you can use the Void type from codeql.util.Void.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do next time. In this case I'd rather unbreak main asap.

@redsun82

Copy link
Copy Markdown
Contributor

@asgerf wdyt, can we merge this as is to unblock main, and do a follow-up PR maybe implementing @hvitved's suggestion and adding the missing doc comments?

@redsun82

Copy link
Copy Markdown
Contributor

@asgerf wdyt, can we merge this as is to unblock main, and do a follow-up PR maybe implementing @hvitved's suggestion and adding the missing doc comments?

ah, no the red check is due to the very compilation error this sets out to fix 👍

@redsun82
redsun82 merged commit 133e269 into github:mainJan 16, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

JSno-change-note-requiredThis PR does not need a change note

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@asgerf@redsun82@hvitved@erik-krogh