aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-01-30 10:49:34 (EST)
committersefftinge2009-01-30 10:49:34 (EST)
commit3ebb773d22936613561612ba7e47a298b50f11e8 (patch)
treebf0d3e2f697e511c2a718cfd2f6d2316b770b917
parent0e9c7e7736392aed947e301b77a92d8434ee7988 (diff)
downloadorg.eclipse.xtext-3ebb773d22936613561612ba7e47a298b50f11e8.zip
org.eclipse.xtext-3ebb773d22936613561612ba7e47a298b50f11e8.tar.gz
org.eclipse.xtext-3ebb773d22936613561612ba7e47a298b50f11e8.tar.bz2
Removed obsolete project
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/.classpath1
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/DELETE.ME0
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/META-INF/MANIFEST.MF19
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/build.properties4
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/AbstractXtendService.java107
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Activator.java50
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/NoSuchExtensionException.java61
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Services.ext22
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java193
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssist.ext54
-rw-r--r--plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssistHelper.java34
11 files changed, 0 insertions, 545 deletions
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/.classpath b/plugins/org.eclipse.xtext.ui.common.xtend/.classpath
index 64c5e31..c835067 100644
--- a/plugins/org.eclipse.xtext.ui.common.xtend/.classpath
+++ b/plugins/org.eclipse.xtext.ui.common.xtend/.classpath
@@ -2,6 +2,5 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/DELETE.ME b/plugins/org.eclipse.xtext.ui.common.xtend/DELETE.ME
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/plugins/org.eclipse.xtext.ui.common.xtend/DELETE.ME
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.ui.common.xtend/META-INF/MANIFEST.MF
deleted file mode 100644
index 3a6680d..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Xtext Xtend Extensions Plug-in
-Bundle-SymbolicName: org.eclipse.xtext.ui.common.xtend
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.xtext.ui.common.xtend.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtext.ui.common;bundle-version="0.7.0",
- org.eclipse.xtend;bundle-version="0.7.0",
- org.eclipse.xtext;bundle-version="0.7.0",
- org.eclipse.jface.text,
- org.eclipse.xtend.typesystem.emf;bundle-version="0.7.0",
- org.eclipse.xtext.log4j;bundle-version="1.2.15",
- org.eclipse.xtend.util.stdlib;bundle-version="0.7.0";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.xtext.ui.common.xtend,
- org.eclipse.xtext.ui.common.xtend.contentassist
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/build.properties b/plugins/org.eclipse.xtext.ui.common.xtend/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/AbstractXtendService.java b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/AbstractXtendService.java
deleted file mode 100644
index 432609d..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/AbstractXtendService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.ui.common.xtend;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.mwe.core.resources.ResourceLoader;
-import org.eclipse.emf.mwe.core.resources.ResourceLoaderFactory;
-import org.eclipse.emf.mwe.core.resources.ResourceLoaderImpl;
-import org.eclipse.internal.xtend.type.impl.java.JavaBeansMetaModel;
-import org.eclipse.xtend.XtendFacade;
-import org.eclipse.xtend.expression.ExecutionContext;
-import org.eclipse.xtend.expression.ExecutionContextImpl;
-import org.eclipse.xtend.expression.TypeSystemImpl;
-import org.eclipse.xtend.expression.Variable;
-import org.eclipse.xtend.typesystem.emf.EmfRegistryMetaModel;
-import org.eclipse.xtext.IGrammarAccess;
-import org.eclipse.xtext.IMetamodelAccess;
-import org.eclipse.xtext.crossref.IScopeProvider;
-import org.eclipse.xtext.service.Inject;
-
-/**
- * Super class for Xtend based services. Registers Xtext services as global
- * variables in the execution context, making them accessible from within Xtend.
- *
- * @author Jan Köhnlein - Initial contribution and API
- */
-public abstract class AbstractXtendService {
-
- @Inject
- protected IGrammarAccess grammarAccess;
-
- @Inject
- protected IMetamodelAccess metamodelAccess;
-
- @Inject
- protected IScopeProvider scopeProvider;
-
- private static final String GRAMMAR_ACCESS_VAR_NAME = "grammarAccess";
- private static final String METAMODEL_ACCESS_VAR_NAME = "metamodelAccess";
- private static final String SCOPE_PROVIDER_VAR_NAME = "scopeProvider";
-
- protected ExecutionContext createExecutionContext() {
- TypeSystemImpl typeSystem = new TypeSystemImpl();
- typeSystem.registerMetaModel(new EmfRegistryMetaModel());
- typeSystem.registerMetaModel(new JavaBeansMetaModel());
- ExecutionContext executionContext = new ExecutionContextImpl(typeSystem, createGlobalVars());
- return executionContext;
- }
-
- protected Map<String, Variable> createGlobalVars() {
- Map<String, Variable> globalVars = new HashMap<String, Variable>();
- addServiceGlobalVar(globalVars, GRAMMAR_ACCESS_VAR_NAME, grammarAccess);
- addServiceGlobalVar(globalVars, METAMODEL_ACCESS_VAR_NAME, metamodelAccess);
- addServiceGlobalVar(globalVars, SCOPE_PROVIDER_VAR_NAME, scopeProvider);
- return globalVars;
- }
-
- protected void addServiceGlobalVar(Map<String, Variable> globalVars, String variableName, Object service) {
- Variable variable = new Variable(variableName, service);
- globalVars.put(variableName, variable);
- }
-
- /**
- * Subclasses must override this to return the right classloader that is
- * able to locate the Xtend files.
- *
- * @return the classloader
- */
- protected abstract ClassLoader getClassLoader();
-
- /**
- * Returns the fully qualified name of the xtend file containing the
- * extensions to be called.
- *
- * @return
- */
- protected abstract String getMasterXtendFileName();
-
- protected Object invokeExtension(String extensionName, List<?> parameterValues) throws NoSuchExtensionException {
- ResourceLoader oldResourceLoader = ResourceLoaderFactory.createResourceLoader();
- try {
- ResourceLoaderFactory.setCurrentThreadResourceLoader(new ResourceLoaderImpl(getClassLoader()));
- ExecutionContext executionContext = createExecutionContext();
- XtendFacade facade = XtendFacade.create(executionContext, getMasterXtendFileName());
- if (!facade.hasExtension(extensionName, parameterValues)) {
- throw new NoSuchExtensionException(extensionName, parameterValues);
- }
- Object result = facade.call(extensionName, parameterValues);
- return result;
- }
- finally {
- ResourceLoaderFactory.setCurrentThreadResourceLoader(oldResourceLoader);
- }
- }
-
- public String toXtendFQName(String fqName) {
- return fqName.replaceAll("\\.", "::");
- }
-}
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Activator.java b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Activator.java
deleted file mode 100644
index 2b0c5ac..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.xtext.ui.common.xtend;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.xtext.ui.common.xtend";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/NoSuchExtensionException.java b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/NoSuchExtensionException.java
deleted file mode 100644
index 7f41af1..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/NoSuchExtensionException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.ui.common.xtend;
-
-import java.util.List;
-
-/**
- * @author Jan Köhnlein - Initial contribution and API
- */
-public class NoSuchExtensionException extends Exception {
-
- private static final long serialVersionUID = 3318038998385424895L;
-
- private String extensionName;
-
- private List<?> params;
-
- public NoSuchExtensionException(String message, String extensionName, List<?> params) {
- super(message);
- this.extensionName = extensionName;
- this.params = params;
- }
-
- public NoSuchExtensionException(String extensionName, List<?> params) {
- super();
- this.extensionName = extensionName;
- this.params = params;
- }
-
- @Override
- public String getMessage() {
- return super.getMessage() + " " + getExtensionSignature();
- }
-
- protected String getExtensionSignature() {
- StringBuffer b = new StringBuffer(extensionName);
- b.append("(");
- boolean isFirst = true;
- for (Object param : params) {
- if (!isFirst)
- b.append(",");
- isFirst = false;
- b.append(param.getClass().getName());
- }
- b.append(")");
- return b.toString();
- }
-
- public String getExtensionName() {
- return extensionName;
- }
-
- public List<?> getParams() {
- return params;
- }
-}
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Services.ext b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Services.ext
deleted file mode 100644
index 6fb389d..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/Services.ext
+++ /dev/null
@@ -1,22 +0,0 @@
-import org::eclipse::xtext::crossref;
-import java::lang;
-
-IScopeProvider grammarAccess():
- GLOBALVAR grammarAccess;
-
-IScopeProvider metamodelAccess():
- GLOBALVAR metamodelAccess;
-
-IScopeProvider scopeProvider():
- GLOBALVAR scopeProvider;
-
-/**
- * We have conflicting metamodels for ecore - Java and EmfRegistry, so we use this
- * Java hack to do the conversion.
- */
-IScope getScope(IScopeProvider this, Object obj, Object ref) :
- JAVA org.eclipse.xtext.ui.common.xtend.contentassist.ContentAssistHelper.getScope(org.eclipse.xtext.crossref.IScopeProvider, java.lang.Object, java.lang.Object);
-
-List toList(Iterable i):
- JAVA org.eclipse.xtext.util.CollectionUtils.list(java.lang.Iterable);
-
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java
deleted file mode 100644
index e9d792a..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/AbstractXtendProposalProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.ui.common.xtend.contentassist;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.xtext.AbstractRule;
-import org.eclipse.xtext.Assignment;
-import org.eclipse.xtext.GrammarUtil;
-import org.eclipse.xtext.Keyword;
-import org.eclipse.xtext.LexerRule;
-import org.eclipse.xtext.ParserRule;
-import org.eclipse.xtext.RuleCall;
-import org.eclipse.xtext.TypeRef;
-import org.eclipse.xtext.parsetree.AbstractNode;
-import org.eclipse.xtext.parsetree.LeafNode;
-import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.AbstractJavaProposalProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.ProposalFilterSorterUtil;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextCompletionProposal;
-import org.eclipse.xtext.ui.common.xtend.AbstractXtendService;
-import org.eclipse.xtext.ui.common.xtend.NoSuchExtensionException;
-import org.eclipse.xtext.util.Strings;
-
-/**
- * Super class for <code>IProposalProvider</code> implementations that call
- * Xtend extensions.
- *
- * Delegates calls to {@link #completeRuleCall(RuleCall, IContentAssistContext)}
- * and {@link #completeAssignment(Assignment, IContentAssistContext)} to grammar
- * specific extensions. The signature of such funcions invoked reflectively
- * follows the following pattern:
- *
- * List[ICompletionProposal] complete[Typename][featureName](Assignment ele,
- * EObject model, String prefix)
- *
- * <b>Example</b> Given the following grammar : <code>
- * RuleA returns MyType :
- * "myType" name=ID;
- * </code>
- *
- * @author Jan K&ouml;hnlein
- * @author Michael Clay
- *
- * @see IProposalProvider
- * @see AbstractJavaProposalProvider
- */
-public abstract class AbstractXtendProposalProvider extends AbstractXtendService implements IProposalProvider {
-
- protected final Logger logger = Logger.getLogger(IProposalProvider.class);
-
- /**
- * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeKeyword(Keyword, IContentAssistContext)
- */
- public List<? extends ICompletionProposal> completeKeyword(Keyword keyword,
- IContentAssistContext contentAssistContext) {
- if (logger.isDebugEnabled()) {
- logger.debug("completeKeyword '" + keyword.getValue() + "' for model '" + contentAssistContext.getModel()
- + "' and prefix '" + contentAssistContext.getMatchString().trim() + "'");
- }
- return Collections
- .singletonList(new XtextCompletionProposal(keyword, keyword.getValue(), contentAssistContext));
- }
-
- /**
- * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeRuleCall(RuleCall, IContentAssistContext)
- */
- public List<? extends ICompletionProposal> completeRuleCall(RuleCall ruleCall,
- IContentAssistContext contentAssistContext) {
- if (logger.isDebugEnabled()) {
- logger.debug("completeRuleCall '" + ruleCall.getRule().getName() + "' cardinality '"
- + ruleCall.getCardinality() + "' for model '" + contentAssistContext.getModel() + "' and prefix '"
- + contentAssistContext.getMatchString().trim().trim() + "'");
- }
- AbstractRule calledRule = ruleCall.getRule();
- if (calledRule instanceof LexerRule) {
- return completeLexerRuleRuleCall((LexerRule) calledRule, ruleCall, contentAssistContext);
- }
- else if (calledRule.getType() != null) {
- TypeRef typeRef = calledRule.getType();
- return invokeExtension("complete" + Strings.toFirstUpper(typeRef.getMetamodel().getAlias()) + "_"
- + Strings.toFirstUpper(typeRef.getType().getName()), Arrays.asList(ruleCall, contentAssistContext
- .getModel(), contentAssistContext));
- }
- return Collections.emptyList();
- }
-
- /**
- * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#completeAssignment(Assignment, IContentAssistContext)
- */
- public List<? extends ICompletionProposal> completeAssignment(Assignment assignment,
- IContentAssistContext contentAssistContext) {
- ParserRule parserRule = GrammarUtil.containingParserRule(assignment);
- return invokeExtension("complete" + Strings.toFirstUpper(parserRule.getName()) + "_"
- + Strings.toFirstUpper(assignment.getFeature()), Arrays.asList(assignment, contentAssistContext));
- }
-
- @SuppressWarnings("unchecked")
- protected List<? extends ICompletionProposal> invokeExtension(String extensionName, List<?> parameterValues) {
- try {
- Object result = super.invokeExtension(extensionName, parameterValues);
- List<ICompletionProposal> proposals = (List<ICompletionProposal>) result;
- return proposals;
- }
- catch(NoSuchExtensionException nsee) {
- return null;
- }
- catch(ClassCastException cce) {
- logger.error("Extension " + extensionName + " must return a Collection of ICompletionProposals.", cce);
- }
- catch(Throwable e) {
- logger.error("Error invoking extension " + extensionName, e);
- }
- return null;
- }
-
- /**
- * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(Keyword, IContentAssistContext)
- */
- public TemplateContextType getTemplateContextType(Keyword keyword, IContentAssistContext contentAssistContext) {
- return null;
- }
-
- /**
- * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplateContextType(RuleCall, IContentAssistContext)
- */
- public TemplateContextType getTemplateContextType(RuleCall ruleCall, IContentAssistContext contentAssistContext) {
- return null;
- }
-
- /**
- * @see org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider#getTemplates(String)
- */
- public Template[] getTemplates(String contextTypeId) {
- return new Template[] {};
- }
-
- protected List<? extends ICompletionProposal> completeLexerRuleRuleCall(LexerRule lexerRule, RuleCall ruleCall,
- IContentAssistContext contentAssistContext) {
- return invokeExtension("complete" + lexerRule.getName(), Arrays.asList(ruleCall, contentAssistContext));
- }
-
- /**
- * @return the id of the plug-in containing the image files;
- * <code>null </code> is returned if the plug-in does not exist
- */
- protected abstract String getPluginId();
-
- /**
- * Returns the the relative path of the default image file, relative to the
- * root of the containing plug-in; the path must be legal The image would
- * typically be shown to the left of the <code>ICompletionProposal</code>
- * display string.
- *
- * @return the image file path of the default image to be shown or
- * <code>null</code> if no image is desired
- * @see #getPluginId()
- */
- protected String getDefaultImageFilePath() {
- return "icons/editor.gif";
- }
-
- /**
- * Concrete subclasses can override this for custom sort and filter
- * behavior. Called right after all completion proposals have been
- * collected.
- *
- * The default behavior of this implementation is to filter duplicates and
- * to trim matching <code>ICompletionProposal#displayString</code> with
- * matching prefix values.
- *
- * @see #sortAndFilter(List, EObject, String, IDocument, int, AbstractNode,
- * LeafNode)
- */
- public List<? extends ICompletionProposal> sortAndFilter(
- List<? extends ICompletionProposal> completionProposalList, IContentAssistContext contentAssistContext) {
- return ProposalFilterSorterUtil.sortAndFilter(completionProposalList, contentAssistContext);
- }
-}
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssist.ext b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssist.ext
deleted file mode 100644
index a3b33c6..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssist.ext
+++ /dev/null
@@ -1,54 +0,0 @@
-import xtext;
-
-import org::eclipse::emf::ecore;
-import org::eclipse::jface::text::contentassist;
-import org::eclipse::xtext::crossref;
-import org::eclipse::xtext::ui::common::editor::contentassist;
-import org::eclipse::xtext::ui::common::xtend::contentassist;
-
-extension org::eclipse::xtext::Extensions reexport;
-extension org::eclipse::xtext::ui::common::xtend::Services reexport;
-extension org::eclipse::xtend::util::stdlib::io;
-
-ICompletionProposal newProposal(AbstractElement element, String text, IContentAssistContext contentAssistContext) :
- JAVA org.eclipse.xtext.ui.common.xtend.contentassist.ContentAssistHelper.newProposal(org.eclipse.xtext.AbstractElement, java.lang.String, org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext);
-
-List[ICompletionProposal] lookupCrossReference(CrossReference crossRef, IContentAssistContext contentAssistContext) :
- scopeProvider() != null
- ? (
- !crossRef.containingParserRule().isDatatypeRule()
- ? lookupCandidates(crossRef, contentAssistContext)
- .filterMatches(contentAssistContext)
- .newProposal(crossRef, contentAssistContext)
- : {}
- )
- : {};
-
-
-// Helper extensions
-List[IScopedElement] lookupCandidates(CrossReference crossRef, IContentAssistContext contentAssistContext) :
- let scope = scopeProvider().getScope(contentAssistContext.model, crossRef.eReference()) :
- (scope != null) ? scope.allContents.toList() : {};
-
-List[IScopedElement] filterMatches(List[IScopedElement] this, IContentAssistContext contentAssistContext) :
- select(e|e.name() != null && e.name().toLowerCase().startsWith(contentAssistContext.matchString.trim().toLowerCase()));
-
-ICompletionProposal newProposal(IScopedElement this, CrossReference crossRef, IContentAssistContext contentAssistContext):
- newProposal(crossRef, name(), contentAssistContext);
-
-
-// Ecore helpers
-EClass referenceOwner(CrossReference this) :
- containingParserRule().type.type;
-
-EReference filterContainmentEReference(ecore::EReference feature) :
- (!feature.containment)
- ? feature
- : null;
-
-EReference filterContainmentEReference(EStructuralFeature feature) :
- null;
-
-EReference eReference(CrossReference this) :
- referenceOwner().getEStructuralFeature(containingAssignment().feature).filterContainmentEReference();
-
diff --git a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssistHelper.java b/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssistHelper.java
deleted file mode 100644
index 9914d88..0000000
--- a/plugins/org.eclipse.xtext.ui.common.xtend/src/org/eclipse/xtext/ui/common/xtend/contentassist/ContentAssistHelper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.ui.common.xtend.contentassist;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.xtext.AbstractElement;
-import org.eclipse.xtext.crossref.IScope;
-import org.eclipse.xtext.crossref.IScopeProvider;
-import org.eclipse.xtext.ui.common.editor.contentassist.IContentAssistContext;
-import org.eclipse.xtext.ui.common.editor.contentassist.impl.XtextCompletionProposal;
-
-/**
- * @author Jan Köhnlein - Initial contribution and API
- */
-public class ContentAssistHelper {
-
- public static ICompletionProposal newProposal(AbstractElement element, String text,
- IContentAssistContext contentAssistContext) {
- return new XtextCompletionProposal(element, text, contentAssistContext);
- }
-
- public static IScope getScope(IScopeProvider scopeProvider, Object context, Object reference) {
- if (reference == null)
- return null;
- return scopeProvider.getScope((EObject) context, (EReference) reference);
- }
-}