Merge pull request #811 from eclipse/msp/webImprovements

Web integration improvements

plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/ContentAssistEntry.xtend

@@ -64,4 +64,10 @@ class ContentAssistEntry {
 	 */
 	val editPositions = new ArrayList<TextRegion>
 	
+	/**
+	 * The EObject or IEObjectDescription for which this entry has been created, if any.
+	 * This field is <em>not</em> serialized when the entry is sent over a communication channel.
+	 */
+	transient Object source
+	
 }

plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeContentProposalProvider.xtend

@@ -7,9 +7,10 @@
  *******************************************************************************/
 package org.eclipse.xtext.ide.editor.contentassist
 
+import com.google.common.base.Predicate
 import com.google.common.base.Predicates
 import com.google.inject.Inject
-import java.util.List
+import java.util.Collection
 import org.eclipse.emf.ecore.EClass
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.eclipse.xtext.AbstractElement
@@ -19,9 +20,8 @@ import org.eclipse.xtext.GrammarUtil
 import org.eclipse.xtext.Keyword
 import org.eclipse.xtext.RuleCall
 import org.eclipse.xtext.TerminalRule
-import org.eclipse.xtext.ide.editor.contentassist.ContentAssistContext
-import org.eclipse.xtext.ide.editor.contentassist.ContentAssistEntry
 import org.eclipse.xtext.naming.IQualifiedNameConverter
+import org.eclipse.xtext.resource.IEObjectDescription
 import org.eclipse.xtext.scoping.IScopeProvider
 import org.eclipse.xtext.util.TextRegion
 import org.eclipse.xtext.xtext.CurrentTypeFinder
@@ -51,7 +51,18 @@ class IdeContentProposalProvider {
 	/**
 	 * Create content assist proposals and pass them to the given acceptor.
 	 */
-	def void createProposals(List<ContentAssistContext> contexts, IIdeContentProposalAcceptor acceptor) {
+	def void createProposals(Collection<ContentAssistContext> contexts, IIdeContentProposalAcceptor acceptor) {
+		for (context : getFilteredContexts(contexts)) {
+			for (element : context.firstSetGrammarElements) {
+				if (!acceptor.canAcceptMoreProposals) {
+					return
+				}
+				createProposals(element, context, acceptor)
+			}
+		}
+	}
+	
+	protected def Iterable<ContentAssistContext> getFilteredContexts(Collection<ContentAssistContext> contexts) {
 		var ContentAssistContext selectedContext
 		for (context : contexts) {
 			if (selectedContext === null || context.acceptable
@@ -59,16 +70,11 @@ class IdeContentProposalProvider {
 				selectedContext = context
 			}
 		}
-		for (context : contexts) {
-			if (context === selectedContext || context.prefix == selectedContext.prefix && context.acceptable) {
-				for (element : context.firstSetGrammarElements) {
-					if (!acceptor.canAcceptMoreProposals) {
-						return
-					}
-					createProposals(element, context, acceptor)
-				}
-			}
-		}
+		val finalSelectedContext = selectedContext
+		return contexts.filter[ context |
+			context === finalSelectedContext
+			|| context.prefix == finalSelectedContext.prefix && context.acceptable
+		]
 	}
 	
 	protected def isAcceptable(ContentAssistContext context) {
@@ -85,7 +91,7 @@ class IdeContentProposalProvider {
 			IIdeContentProposalAcceptor acceptor) {
 		val terminal = assignment.terminal
 		if (terminal instanceof CrossReference) {
-			createProposals(assignment.terminal, context, acceptor)
+			createProposals(terminal, context, acceptor)
 		} else if (terminal instanceof RuleCall) {
 			val rule = terminal.rule
 			if (rule instanceof TerminalRule && context.prefix.empty) {
@@ -116,7 +122,7 @@ class IdeContentProposalProvider {
 		}
 	}
 	
-	protected def filterKeyword(Keyword keyword, ContentAssistContext context) {
+	protected def boolean filterKeyword(Keyword keyword, ContentAssistContext context) {
 		keyword.value.regionMatches(true, 0, context.prefix, 0, context.prefix.length)
 			&& keyword.value.length > context.prefix.length
 	}
@@ -133,9 +139,15 @@ class IdeContentProposalProvider {
 			val ereference = GrammarUtil.getReference(reference, type)
 			if (ereference !== null) {
 				val scope = scopeProvider.getScope(context.currentModel, ereference)
-				crossrefProposalProvider.lookupCrossReference(scope, reference, context, acceptor, Predicates.alwaysTrue)
+				crossrefProposalProvider.lookupCrossReference(scope, reference, context, acceptor,
+					getCrossrefFilter(reference, context))
 			}
 		}
 	}
 	
+	protected def Predicate<IEObjectDescription> getCrossrefFilter(CrossReference reference,
+			ContentAssistContext context) {
+		Predicates.alwaysTrue
+	}
+	
 }

plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/contentassist/IdeCrossrefProposalProvider.xtend

@@ -36,6 +36,9 @@ class IdeCrossrefProposalProvider {
 			IIdeContentProposalAcceptor acceptor, Predicate<IEObjectDescription> filter) {
 		try {
 			for (candidate : queryScope(scope, crossReference, context)) {
+				if (!acceptor.canAcceptMoreProposals) {
+					return
+				}
 				if (filter.apply(candidate)) {
 					val entry = createProposal(candidate, crossReference, context)
 					acceptor.accept(entry, proposalPriorities.getCrossRefPriority(candidate, entry))
@@ -72,6 +75,7 @@ class IdeCrossrefProposalProvider {
 	
 	protected def ContentAssistEntry createProposal(IEObjectDescription candidate, CrossReference crossRef, ContentAssistContext context) {
 		return new ContentAssistEntry => [
+			source = candidate
 			prefix = context.prefix
 			proposal = qualifiedNameConverter.toString(candidate.name)
 			description = candidate.getEClass?.name

plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/labels/INameLabelProvider.xtend

@@ -28,7 +28,7 @@ class SimpleNameLabelProvider implements INameLabelProvider {
 				SimpleAttributeResolver.NAME_RESOLVER.apply(element)
 			IEObjectDescription:
 				element.name.lastSegment
-			default: 
+			default:
 				null
 		}
 	}

plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/web/WebIntegrationFragment.xtend

@@ -777,12 +777,12 @@ class WebIntegrationFragment extends AbstractXtextGeneratorFragment {
 				«IF !useServlet3Api»
 					
 					<servlet>
-						<servlet-name>StaticContentServlet</servlet-name>
-						<servlet-class>org.eclipse.xtext.web.servlet.StaticContentServlet</servlet-class>
+						<servlet-name>XtextResourcesServlet</servlet-name>
+						<servlet-class>org.eclipse.xtext.web.servlet.XtextResourcesServlet</servlet-class>
 					</servlet>
 					
 					<servlet-mapping>
-						<servlet-name>StaticContentServlet</servlet-name>
+						<servlet-name>XtextResourcesServlet</servlet-name>
 						<url-pattern>/xtext/*</url-pattern>
 					</servlet-mapping>