Skip to content

Merge main into feature/OHI - #586

Open
aws-toolkit-automation wants to merge 1 commit into
feature/OHIfrom
autoMerge/feature/OHI
Open

aws-toolkit-automation wants to merge 1 commit into
feature/OHIfrom
autoMerge/feature/OHI

Conversation

@aws-toolkit-automation

Copy link
Copy Markdown
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/OHI
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/OHI

ITextEditor.getDocumentProvider() is optional in the Eclipse API and may
return null for third party editors. AutoTriggerPartListener dereferenced
it unconditionally on every editor activation, so the NPE escaped the
IPartListener2 callback and the workbench showed a generic error dialog.

Resolve the provider and document defensively in AutoTriggerPartListener
(partActivated and onStart) and in QEclipseEditorUtils.getSelectionRange
and insertAtCursor, degrading to a no-op instead of throwing.
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.

2 participants