From c2e0ad7397d3ecc0de5580ec812876e49b1214fd Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Fri, 2 Oct 2015 14:01:15 +0200 Subject: [PATCH 1/3] [xtext generator] migrated 'QuickOutlineFragment' Signed-off-by: Christian Schneider --- .../ui/outline/QuickOutlineFragment2.xtend | 68 +++++++++++++++++++ .../wizard/RuntimeProjectDescriptor.xtend | 5 +- 2 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend new file mode 100644 index 000000000..ffb1bdef5 --- /dev/null +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ui/outline/QuickOutlineFragment2.xtend @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2015 itemis AG (http://www.itemis.eu) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.xtext.xtext.generator.ui.outline + +import com.google.inject.Inject +import org.eclipse.xtext.xtext.generator.AbstractGeneratorFragment2 +import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming + +/** + * Contributes the 'Quick Outline' entry to the language editor's context menu. + * + * @author Christian Schneider - Initial contribution and API + */ +class QuickOutlineFragment2 extends AbstractGeneratorFragment2 { + + @Inject + extension XtextGeneratorNaming + + override generate() { + if (projectConfig.eclipsePluginManifest != null) { + projectConfig.eclipsePluginManifest.requiredBundles += "org.eclipse.xtext.ui" + } + + if (projectConfig.eclipsePluginPluginXml != null) { + projectConfig.eclipsePluginPluginXml.entries += ''' + + + + + + + + + + + + + + + + + + + + + + + ''' + } + } +} \ No newline at end of file diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 066e289e7..1e19df222 100644 --- a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -286,9 +286,8 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { // outline API fragment = ui.outline.OutlineTreeProviderFragment2 {} - fragment = adapter.FragmentAdapter { - fragment = outline.QuickOutlineFragment auto-inject {} - } + // quick outline menu contribution + fragment = ui.outline.QuickOutlineFragment2 auto-inject {} // quickfix API fragment = adapter.FragmentAdapter { From d2decd2c846f1b193134ab2baf76d5a08fd85e03 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Mon, 5 Oct 2015 09:25:31 +0200 Subject: [PATCH 2/3] Re-added lost 'auto-inject' in the project wizard's workflow template to call of 'OutlineTreeProviderFragment2' (related to #641, c064033e22973955dfae969680cbdec5efe1d808) Signed-off-by: Christian Schneider --- .../eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend index 1e19df222..e587e89ee 100644 --- a/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend +++ b/plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend @@ -284,7 +284,7 @@ class RuntimeProjectDescriptor extends TestedProjectDescriptor { } // outline API - fragment = ui.outline.OutlineTreeProviderFragment2 {} + fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {} // quick outline menu contribution fragment = ui.outline.QuickOutlineFragment2 auto-inject {} From 76b07340b4a2a97be5ecda56721990ac6746ab93 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Tue, 6 Oct 2015 10:06:32 +0200 Subject: [PATCH 3/3] [xtext tests] updated expected 'GenerateMyDsl.mwe2' files checked by 'CliWizardIntegrationTest' Signed-off-by: Christian Schneider --- .../src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 | 7 +++---- .../src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 | 7 +++---- .../src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 index 039b9407e..47f506732 100644 --- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 +++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.eclipsePlugin/org.xtext.example.eclipsePlugin/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 @@ -86,11 +86,10 @@ Workflow { } // outline API - fragment = ui.outline.OutlineTreeProviderFragment2 {} + fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {} - fragment = adapter.FragmentAdapter { - fragment = outline.QuickOutlineFragment auto-inject {} - } + // quick outline menu contribution + fragment = ui.outline.QuickOutlineFragment2 auto-inject {} // quickfix API fragment = adapter.FragmentAdapter { diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 index 0b9f83d92..af83a57f1 100644 --- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 +++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 @@ -88,11 +88,10 @@ Workflow { } // outline API - fragment = ui.outline.OutlineTreeProviderFragment2 {} + fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {} - fragment = adapter.FragmentAdapter { - fragment = outline.QuickOutlineFragment auto-inject {} - } + // quick outline menu contribution + fragment = ui.outline.QuickOutlineFragment2 auto-inject {} // quickfix API fragment = adapter.FragmentAdapter { diff --git a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 index 2058e0bb3..91227830e 100644 --- a/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 +++ b/tests/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho/src/org/xtext/example/mydsl/GenerateMyDsl.mwe2 @@ -87,11 +87,10 @@ Workflow { } // outline API - fragment = ui.outline.OutlineTreeProviderFragment2 {} + fragment = ui.outline.OutlineTreeProviderFragment2 auto-inject {} - fragment = adapter.FragmentAdapter { - fragment = outline.QuickOutlineFragment auto-inject {} - } + // quick outline menu contribution + fragment = ui.outline.QuickOutlineFragment2 auto-inject {} // quickfix API fragment = adapter.FragmentAdapter {