This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Provide quickfixes for illegal rule references (WIP) #1492

Closed

nbhusare wants to merge 19 commits into eclipse:master from nbhusare:nb_1448_03

Contributor

nbhusare commented Jul 21, 2020 •

edited

Enhanced the quick-fix to handle case where a terminal-fragment is referenced as a hidden token in a Parser rule definition
Added method createChangeToIssueResolution() to avoid duplicate 'Change to' quick-fix if there are multiple/different fixes for an issue
Added quick-fix method fixUnresolvedEnumRule().

Signed-off-by: nbhusare neerajbhusare@gmail.com

cdietrich added this to the Release_2.23 milestone

nbhusare mentioned this pull request

Add new Xtext editor quickfixes on *.xtext files #1448

Closed

nbhusare force-pushed the nb_1448_03 branch from 19b2177 to dbfe7e2 Compare

July 22, 2020 08:59

cdietrich reviewed

View reviewed changes

...xt.xtext.ui/src/org/eclipse/xtext/xtext/ui/editor/quickfix/XtextGrammarQuickfixProvider.java Outdated

-              		createLinkingIssueResolutions(issue, acceptor);
+              				createNewRule(ruleName, ruleType));
+              		Optional<IssueResolution> iResolution = acceptor.getIssueResolutions().stream().filter(ir -> {

Member

cdietrich Jul 22, 2020

i am not sure if i like the after effect filtering
shouldnt
createLinkingIssueResolutions
be modified to ctreate resolutions for that matching methods rule type only

Member

cdietrich Jul 22, 2020

@szarnekow what do you think?

Contributor

szarnekow Jul 24, 2020

I'd be in favor of adding another @Fix(UNRESOLVED_TERMINAL_RULE) and call createLinkingIssueResolutions() from there to make sure it is only invoked once for that issue code.

cdietrich requested a review from szarnekow

July 24, 2020 06:50


          Provide quickfixes for illegal rule references

962d90d

Signed-off-by: nbhusare <neerajbhusare@gmail.com>

nbhusare force-pushed the nb_1448_03 branch from dbfe7e2 to 962d90d Compare

July 24, 2020 11:56

nbhusare changed the title ~~Provide quickfixes for illegal rule references (WIP)~~ Provide quickfixes for illegal rule references

nbhusare changed the title ~~Provide quickfixes for illegal rule references~~ Provide quickfixes for illegal rule references (WIP)

cdietrich and others added 10 commits

July 29, 2020 07:05


          [eclipse#1494] fixed race condition on loading the Xtext index from m…

a949941

…ultiple threads

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          Merge pull request eclipse#1495 from eclipse/cd_issue1494

36a7e6f

[eclipse#1494] fixed race condition on loading the Xtext index from multiple threads


          fixed visibility of loadLock

ae4ee55

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          [eclipse/xtext#1816] harmonize includeSource to true in preparation f…

ccdf020

…or tycho 2.0

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          Merge pull request eclipse#1496 from eclipse/cd_includeSource

618a3c4

[eclipse/xtext#1816] harmonize includeSource to true in preparation for tycho 2.0


          [eclipse#1497] Provide the AbstractCodeMiningTest abstract base class.

ad9b8ec

- Extend the 'Xtext UI Testing' test infrastructure by the
AbstractCodeMiningTest abstract class to provide a base infrastructure
for testing the code mining capabilities.
- Extend the Xtext Examples by CodeMiningTest test cases to
demonstrate the usage of the AbstractCodeMiningTest class.

Signed-off-by: Tamas Miklossy <miklossy@itemis.de>


          regenerated docs

7c44d5a

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          Merge pull request eclipse#1499 from eclipse/cd_regen_docsM2

0acb37d

regenerated docs


          fixed warning

250c247

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          Merge pull request eclipse#1500 from eclipse/cd_fixWarningCM

b3eb3a0

fixed warning

szarnekow approved these changes

View reviewed changes

szarnekow reviewed

View reviewed changes

Contributor

szarnekow left a comment

Sorry, that was too fast from my side. Is this good to be reviewed or WIP?

szarnekow self-requested a review

August 3, 2020 08:22

cdietrich and others added 6 commits

August 3, 2020 13:21


          removed obsolete org.eclipse.xtend.shared.ui.prefs

fbc272b

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          [releng] Bootstrap against 2.23.0.M2

624b670

Signed-off-by: Nico Prediger <mail@nicoprediger.de>


          Merge pull request eclipse#1502 from eclipse/bot_update_xtext_bootstr…

955c8c1

…ap_version

[releng] Bootstrap against 2.23.0.M2


          Merge pull request eclipse#1501 from eclipse/cd_rm_xtend_shared_ui_prefs

fcb2f5e

removed obsolete org.eclipse.xtend.shared.ui.prefs


          always archive ui test logs

ca806ae

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>


          Merge pull request eclipse#1506 from eclipse/cd_fail

3b22e6d

always archive ui test logs

Contributor Author

nbhusare commented Aug 10, 2020

@szarnekow The code changes are good to be reviewed. I haven't fixed the unit-tests which is why I have put WIP.


          Provide quickfixes for illegal rule references

6694a95

Signed-off-by: nbhusare <neerajbhusare@gmail.com>


          Merge branch 'nb_1448_03' of https://github.com/nbhusare/xtext-eclipse …

d2d08d3

…into nb_1448_03

Member

cdietrich commented Aug 10, 2020

@nbhusare the 19 commits look wired? did you properly rebase on eclipse/master?

Contributor Author

nbhusare commented Aug 10, 2020 •

edited

@cdietrich I had rebased correctly. In Eclipse, I saw that my branch was lagging behind some comments in remote after which I pulled which lead to this state.

Member

cdietrich commented Aug 10, 2020

there is this merge commit.
on rebases there should be no merges

Contributor Author

nbhusare commented Aug 10, 2020

@cdietrich I am not sure. I don't merge except on the master (git fetch upstream, git merge upstrem/master, git push) after which I switch to the feature branch and do a git rebase master.

Contributor Author

nbhusare commented Aug 10, 2020

@cdietrich Probably the git pull on the feature branch might have created the merge commit. I am not sure.

Contributor Author

nbhusare commented Aug 10, 2020

@cdietrich I'll be discarding the branch after porting the changes to a new one.

Member

cdietrich commented Aug 10, 2020

can you please try to clean that up

undo last commit (e.g. git reset HEAD~)
rebase on eclipse/master

or

move create a new branch from yours
on the pr branch, reset to origin master and cherry-pick your commit

or create a new branch?

Contributor Author

nbhusare commented Aug 10, 2020

@cdietrich I have created a new branch - #1507
@szarnekow Please use pull/1507 for any further review.

nbhusare closed this

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.