Skip to content
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.

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

[3.x] Fix LSP completion crashing on scene-less scripts #51333

Merged
merged 1 commit into from
Aug 6, 2021

Conversation

Razoric480
Copy link
Contributor

@Razoric480 Razoric480 commented Aug 6, 2021

Companion PR for #51332, since ResourceLoader::load() has a different interface from 4.0's version.

Bugsquad edit: Fixes regression from #51283.

@akien-mga akien-mga merged commit a0810f3 into godotengine:3.x Aug 6, 2021
@akien-mga
Copy link
Member

Thanks!

@Rubonnek Rubonnek added cherrypick:3.x Considered for cherry-picking into a future 3.x release and removed cherrypick:3.x Considered for cherry-picking into a future 3.x release labels Aug 9, 2021
@Calinou
Copy link
Member

Calinou commented Aug 20, 2021

This may need to be cherry-picked to 3.3 to fix #51923.

@akien-mga
Copy link
Member

akien-mga commented Aug 20, 2021

Indeed, I misidentified this as a fix for a regression from #48616 which was not cherry-picked, while it's a regression from #51283 which has been. That's why it's important to make this explicit in PR descriptions so that we can decide which branches need the fix.

Edit: Or actually, it's that the cherry-pick has a conflict due to not having cherry-picked #48616, so I thought it wasn't relevant. But there's two files modified in this fix, and the non-conflicting change is indeed needed.

@akien-mga
Copy link
Member

Cherry-picked for 3.3.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants