Fix Issues introduced by PR #2051 #2612
Conversation
|
|
||
| IAutoEditStrategy[] autoEditStrategies= new IAutoEditStrategy[] { getAutoIndentStrategy(sourceViewer, contentType) }; | ||
| ArrayList<IAutoEditStrategy> autoEditStrategiesList= new ArrayList<>(Arrays.asList(autoEditStrategies)); | ||
| autoEditStrategiesList.add(new SurroundWithBracketsStrategy(sourceViewer)); | ||
| return autoEditStrategiesList.toArray(new IAutoEditStrategy[0]); |
There was a problem hiding this comment.
| IAutoEditStrategy[] autoEditStrategies= new IAutoEditStrategy[] { getAutoIndentStrategy(sourceViewer, contentType) }; | |
| ArrayList<IAutoEditStrategy> autoEditStrategiesList= new ArrayList<>(Arrays.asList(autoEditStrategies)); | |
| autoEditStrategiesList.add(new SurroundWithBracketsStrategy(sourceViewer)); | |
| return autoEditStrategiesList.toArray(new IAutoEditStrategy[0]); | |
| return new IAutoEditStrategy[] { getAutoIndentStrategy(sourceViewer, contentType), new SurroundWithBracketsStrategy(sourceViewer) }; |
| if (bracketsMap.containsKey(command.text)) { | ||
| if (command.text != null && bracketsMap.containsKey(command.text)) { | ||
| try { | ||
| ITextSelection selection= (ITextSelection) sourceViewer.getSelectionProvider().getSelection(); |
There was a problem hiding this comment.
as suggested by @szarnekow earlier, it'd be best to use command.getSelection() here instead of asking the viewer again.
|
locally tested: This PR fixes jdt.ui SmokeViewsTest |
lathapatil
force-pushed
the
Issues/2600_IssuesFix_introducedBy_PR_2051
branch
from
c8bb5fc to
272e7f8
Compare
Fixes eclipse-platform#2600 Review points implementation
lathapatil
force-pushed
the
Issues/2600_IssuesFix_introducedBy_PR_2051
branch
from
272e7f8 to
7a453c6
Compare
|
@szarnekow Do you agree that this PR fixes your concerns about configurability? Any objection to merge? |
|
Can we merge this. in SourceViewer#configure is null. |
Yes, this looks all good to me. |
merks
dismissed
mickaelistria’s stale review
I think asking @szarnekow his opinion implies that you approve.
|
Just for safety and comfort, I restarted the Linux verification. For a recent p2 PR, I found that repeated re-running eventually succeeds, so I'm interested to see if that works here too. |
|
See, rinse, lather, repeat, and then all the builds are good:
|
| * @return the auto edit strategies or <code>null</code> if automatic editing is not to be enabled | ||
| * @since 3.1 | ||
| */ | ||
| public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) { |
There was a problem hiding this comment.
the javadoc of this method says
For backward compatibility, this implementation always returns an array containing the result of {@link #getAutoIndentStrategy(ISourceViewer, String)}.
So we are now breaking this compatibility contract?
7 participants
Fixes #2600