From 2261b4b669a798e24375ea2f922704fa3ba03de7 Mon Sep 17 00:00:00 2001
From: Graham Pearson <Graham.Pearson@avaloq.com>
Date: Wed, 7 Feb 2018 12:01:33 +0000
Subject: [PATCH] #51: Autocorrect to add check to configuration does not put
 string params in quotes

* Extract the code for creating a literal-value template pattern from
CheckCfgTemplateProposalProvider into a new helper,
TemplateProposalProviderHelper, where it can be unit tested.
* Avoid getting a JvmType representation of String just to check the
type of a Check parameter.
* CheckConfiguration template now gets the check configuration name from
the filename instead of using hardwired value "name".
* Move ResourceNameTemplateVariableResolver from ddk.check.ui to
ddk.xtext.ui so CheckCfgTemplateProposalProvider can use it. Changed its
'catalog' parameter value to 'file' to better reflect its meaning.
* Add unit tests for
** ResourceNameTemplateVariableResolver (only when resolving a filename;
resolving a package name looks much less testable and hasn't been
touched)
** SimpleEnumTemplateVariableResolver
** TemplateProposalProviderHelper

Issue-Id: #51
---
 .../templates/CheckTemplateContextType.java   |   3 +-
 .../templates/templates.xml                   |   2 +-
 .../ddk/checkcfg/ui/CheckCfgUiModule.java     |   3 +-
 .../CheckCfgTemplateContextType.java          |   2 +
 .../CheckCfgTemplateProposalProvider.java     |  24 +-
 .../templates/templates.xml                   |   2 +-
 com.avaloq.tools.ddk.xtext.ui.test/.classpath |  12 +-
 .../META-INF/MANIFEST.MF                      |   1 +
 .../build.properties                          |   3 +-
 ...ourceNameTemplateVariableResolverTest.java | 126 +++++++++
 ...impleEnumTemplateVariableResolverTest.java |  78 ++++++
 .../TemplateProposalProviderHelperTest.xtend  | 260 ++++++++++++++++++
 .../TemplateVariableResolverTestHelper.java   |  57 ++++
 .../ddk/xtext/ui/test/XtextUiTestSuite.java   |   8 +-
 .../xtend-gen/.gitignore                      |   0
 com.avaloq.tools.ddk.xtext.ui/.classpath      |   1 +
 .../META-INF/MANIFEST.MF                      |  65 ++---
 .../build.properties                          |   3 +-
 .../ResourceNameTemplateVariableResolver.java |  29 +-
 .../TemplateProposalProviderHelper.xtend      |  80 ++++++
 .../xtend-gen/.gitignore                      |   0
 21 files changed, 688 insertions(+), 71 deletions(-)
 create mode 100644 com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolverTest.java
 create mode 100644 com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/SimpleEnumTemplateVariableResolverTest.java
 create mode 100644 com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelperTest.xtend
 create mode 100644 com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
 create mode 100644 com.avaloq.tools.ddk.xtext.ui.test/xtend-gen/.gitignore
 rename {com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check => com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext}/ui/templates/ResourceNameTemplateVariableResolver.java (72%)
 create mode 100644 com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend
 create mode 100644 com.avaloq.tools.ddk.xtext.ui/xtend-gen/.gitignore

diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/CheckTemplateContextType.java b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/CheckTemplateContextType.java
index 8dac516ee..8bc672e59 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/CheckTemplateContextType.java
+++ b/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/CheckTemplateContextType.java
@@ -12,6 +12,8 @@
 
 import org.eclipse.xtext.ui.editor.templates.XtextTemplateContextType;
 
+import com.avaloq.tools.ddk.xtext.ui.templates.ResourceNameTemplateVariableResolver;
+
 
 /**
  * Used for adding custom template variable resolvers.
@@ -26,4 +28,3 @@ protected void addDefaultTemplateVariables() {
   }
 
 }
-
diff --git a/com.avaloq.tools.ddk.check.ui/templates/templates.xml b/com.avaloq.tools.ddk.check.ui/templates/templates.xml
index 43f82071c..872c0cb62 100644
--- a/com.avaloq.tools.ddk.check.ui/templates/templates.xml
+++ b/com.avaloq.tools.ddk.check.ui/templates/templates.xml
@@ -10,7 +10,7 @@
 /**
  * @todo Document catalog.
  */
-catalog ${catalogName:ResourceName('catalog')}
+catalog ${catalogName:ResourceName('file')}
 for grammar ${grammarName:CrossReference(CheckCatalog.grammar)} {
   ${cursor}
 }</template>
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/CheckCfgUiModule.java b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/CheckCfgUiModule.java
index b3721f481..bf05f0e3a 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/CheckCfgUiModule.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/CheckCfgUiModule.java
@@ -23,6 +23,7 @@
 import com.avaloq.tools.ddk.checkcfg.ui.templates.CheckCfgTemplateProposalProvider;
 import com.avaloq.tools.ddk.xtext.ui.editor.FixedDirtyStateEditorSupport;
 import com.avaloq.tools.ddk.xtext.ui.templates.KeywordAwareCrossReferenceTemplateVariableResolver;
+import com.avaloq.tools.ddk.xtext.ui.templates.ResourceNameTemplateVariableResolver;
 import com.avaloq.tools.ddk.xtext.ui.templates.SimpleEnumTemplateVariableResolver;
 
 
@@ -35,7 +36,7 @@ public CheckCfgUiModule(final AbstractUIPlugin plugin) {
   }
 
   /**
-   * Binds a {@link XtextTemplateContextType} which adds {@link SimpleEnumTemplateVariableResolver}.
+   * Binds a {@link XtextTemplateContextType} which adds {@link ResourceNameTemplateVariableResolver} and {@link SimpleEnumTemplateVariableResolver}.
    *
    * @return {@link CheckCfgTemplateContextType}
    */
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateContextType.java b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateContextType.java
index 4663e2203..ec118ce02 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateContextType.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateContextType.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.xtext.ui.editor.templates.XtextTemplateContextType;
 
+import com.avaloq.tools.ddk.xtext.ui.templates.ResourceNameTemplateVariableResolver;
 import com.avaloq.tools.ddk.xtext.ui.templates.SimpleEnumTemplateVariableResolver;
 
 
@@ -23,6 +24,7 @@ public class CheckCfgTemplateContextType extends XtextTemplateContextType {
   @Override
   protected void addDefaultTemplateVariables() {
     super.addDefaultTemplateVariables();
+    addResolver(new ResourceNameTemplateVariableResolver());
     addResolver(new SimpleEnumTemplateVariableResolver());
   }
 
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java
index 9c852071a..e0cc78c81 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java
+++ b/com.avaloq.tools.ddk.checkcfg.ui/src/com/avaloq/tools/ddk/checkcfg/ui/templates/CheckCfgTemplateProposalProvider.java
@@ -12,7 +12,6 @@
 
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.StringJoiner;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -24,7 +23,6 @@
 import org.eclipse.jface.text.templates.persistence.TemplateStore;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.xtext.EcoreUtil2;
-import org.eclipse.xtext.common.types.JvmType;
 import org.eclipse.xtext.conversion.impl.QualifiedNameValueConverter;
 import org.eclipse.xtext.resource.IEObjectDescription;
 import org.eclipse.xtext.scoping.IScopeProvider;
@@ -34,7 +32,6 @@
 import org.eclipse.xtext.ui.editor.templates.DefaultTemplateProposalProvider;
 import org.eclipse.xtext.util.Strings;
 import org.eclipse.xtext.xbase.interpreter.impl.XbaseInterpreter;
-import org.eclipse.xtext.xbase.jvmmodel.JvmTypeReferenceBuilder;
 
 import com.avaloq.tools.ddk.check.check.Check;
 import com.avaloq.tools.ddk.check.check.CheckCatalog;
@@ -44,6 +41,7 @@
 import com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCatalog;
 import com.avaloq.tools.ddk.checkcfg.checkcfg.ConfiguredCheck;
 import com.avaloq.tools.ddk.checkcfg.ui.labeling.CheckCfgImages;
+import com.avaloq.tools.ddk.xtext.ui.templates.TemplateProposalProviderHelper;
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -72,10 +70,10 @@ public class CheckCfgTemplateProposalProvider extends DefaultTemplateProposalPro
   @Inject
   private QualifiedNameValueConverter qualifiedNameValueConverter;
 
-  private final TemplateStore templateStore;
-
   @Inject
-  private JvmTypeReferenceBuilder.Factory typeRefBuilderFactory;
+  private TemplateProposalProviderHelper helper;
+
+  private final TemplateStore templateStore;
 
   @Inject
   public CheckCfgTemplateProposalProvider(final TemplateStore templateStore, final ContextTypeRegistry registry, final ContextTypeIdHelper helper) {
@@ -153,8 +151,7 @@ private void addCatalogConfigurations(final TemplateContext templateContext, fin
             builder.append(Strings.newLine());
           }
           final String catalogName = qualifiedNameValueConverter.toString(description.getQualifiedName().toString());
-          builder.append("catalog ").append(catalogName).append(" {").append(Strings.newLine()); //$NON-NLS-1$ //$NON-NLS-2$
-          builder.append('}').append(Strings.newLine());
+          builder.append("catalog ").append(catalogName).append(" {}").append(Strings.newLine()); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
       }
@@ -218,23 +215,20 @@ public String apply(final ConfiguredCheck from) {
       }
     }), Predicates.notNull());
     final CheckCatalog catalog = configuredCatalog.getCatalog();
-    final JvmType stringType = typeRefBuilderFactory.create(context.getResource().getResourceSet()).typeRef(String.class).getType();
     for (final Check check : catalog.getAllChecks()) {
       // create a template on the fly
       final String checkName = check.getName();
       if (!Iterables.contains(alreadyConfiguredCheckNames, checkName)) {
 
         // check if referenced check has configurable parameters
-        final StringJoiner paramsJoiner = new StringJoiner(", ", " ( ", ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        final StringJoiner paramsJoiner = new StringJoiner(", ", " (", ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         paramsJoiner.setEmptyValue(""); //$NON-NLS-1$
         for (final FormalParameter param : check.getFormalParameters()) {
-          final JvmType paramType = param.getType().getType();
           final String paramName = param.getName();
-          final String defaultValue = String.valueOf(interpreter.evaluate(param.getRight()).getResult());
+          final Object defaultValue = interpreter.evaluate(param.getRight()).getResult();
 
-          // Use SimpleEnumTemplateVariableResolver with strings because otherwise TemplateTranslator can't cope with whitespace
-          paramsJoiner.add(paramName + " = " + (Objects.equals(stringType, paramType) ? "\"${defaultValue:SimpleEnum('" + defaultValue + "')}\"" //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-              : "${" + defaultValue + '}')); //$NON-NLS-1$
+          final String valuePlaceholder = helper.createLiteralValuePattern(paramName, defaultValue);
+          paramsJoiner.add(paramName + " = " + valuePlaceholder); //$NON-NLS-1$
         }
 
         final String severity = (catalog.isFinal() || check.isFinal()) ? "default " : "${default:Enum('SeverityKind')} "; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/com.avaloq.tools.ddk.checkcfg.ui/templates/templates.xml b/com.avaloq.tools.ddk.checkcfg.ui/templates/templates.xml
index be22b7771..07b55026c 100644
--- a/com.avaloq.tools.ddk.checkcfg.ui/templates/templates.xml
+++ b/com.avaloq.tools.ddk.checkcfg.ui/templates/templates.xml
@@ -10,7 +10,7 @@
       deleted="false"
       description="Creates a new empty check configuration"
       enabled="true"
-      name="CheckConfiguration">check configuration ${name} {
+      name="CheckConfiguration">check configuration ${name:ResourceName('file')} {
   ${cursor}
 }</template>
     <template
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/.classpath b/com.avaloq.tools.ddk.xtext.ui.test/.classpath
index 1e38165fc..a87a71b47 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/.classpath
+++ b/com.avaloq.tools.ddk.xtext.ui.test/.classpath
@@ -1,6 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><classpath>
-  <classpathentry kind="src" path="src"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-  <classpathentry kind="output" path="bin"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
index c21699eea..4819bfc29 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui.test/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Avaloq Evolution AG
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.xtext.ui,
+ org.eclipse.xtext.xbase.lib,
  org.junit,
  org.mockito,
  com.avaloq.tools.ddk.xtext.ui,
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/build.properties b/com.avaloq.tools.ddk.xtext.ui.test/build.properties
index 41eb6ade2..d6c49e5cf 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/build.properties
+++ b/com.avaloq.tools.ddk.xtext.ui.test/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolverTest.java b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolverTest.java
new file mode 100644
index 000000000..1fe86d42c
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolverTest.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG 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
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.xtext.ui.templates;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.text.templates.TemplateException;
+import org.eclipse.jface.text.templates.TemplateVariable;
+import org.eclipse.xtext.XtextRuntimeModule;
+import org.eclipse.xtext.ui.editor.model.IXtextDocument;
+import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import com.google.common.collect.Iterables;
+import com.google.inject.Guice;
+
+
+public class ResourceNameTemplateVariableResolverTest {
+
+  private static final Object[] FILE = new Object[] {"file"}; //$NON-NLS-1$
+  private static final String FILENAME = "filename"; //$NON-NLS-1$
+
+  private static XtextTemplateContext mockContext;
+  private static IXtextDocument mockDocument;
+  private static IFile mockFile;
+
+  private static TemplateVariableResolverTestHelper helper;
+
+  private static ResourceNameTemplateVariableResolver resolver;
+
+  @BeforeClass
+  public static void beforeClass() {
+    mockContext = Mockito.mock(XtextTemplateContext.class);
+    mockDocument = Mockito.mock(IXtextDocument.class);
+    mockFile = Mockito.mock(IFile.class);
+
+    helper = Guice.createInjector(new XtextRuntimeModule()).getInstance(TemplateVariableResolverTestHelper.class);
+
+    resolver = new ResourceNameTemplateVariableResolver();
+
+    Mockito.when(mockContext.getDocument()).thenReturn(mockDocument);
+    Mockito.when(mockDocument.getAdapter(IFile.class)).thenReturn(mockFile);
+  }
+
+  @AfterClass
+  public static void afterClass() {
+    mockContext = null;
+    mockDocument = null;
+    mockFile = null;
+
+    helper = null;
+
+    resolver = null;
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testResolveValuesWithNullVariable() {
+    resolver.resolveValues(null, mockContext);
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testResolveValuesWithNullContext() {
+    resolver.resolveValues(Mockito.mock(TemplateVariable.class), null);
+  }
+
+  @Test
+  public void testResolveValuesWithFileWithoutExtension() throws TemplateException {
+    final String filename = "filenamewithnoextension"; //$NON-NLS-1$
+    testResolveValues(FILE, filename, filename);
+  }
+
+  @Test
+  public void testResolveValuesWithFileWithExtension() throws TemplateException {
+    testResolveValues(FILE, "filename.with.extension", "filename.with"); //$NON-NLS-1$//$NON-NLS-2$
+  }
+
+  @Test
+  public void testResolveValuesWithExtraParams() throws TemplateException {
+    testResolveValues(new Object[] {FILE[0], "other", "random", "values"}, FILENAME, FILENAME); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+  }
+
+  @Test
+  public void testResolveValuesWithUnknownParam() throws TemplateException {
+    testResolveValues(new Object[] {"This is not the parameter you are looking for"}, FILENAME); //$NON-NLS-1$
+  }
+
+  @Test
+  public void testResolveValuesWithWrongTypeOfParam() throws TemplateException {
+    testResolveValues(new Object[] {42}, FILENAME);
+  }
+
+  /**
+   * Test resolveValues().
+   *
+   * @param values
+   *          values to resolve
+   * @param filename
+   *          filename to return from the mock {@link IFile}
+   * @param expectedResolvedValues
+   *          expected return value
+   */
+  public void testResolveValues(final Object[] values, final String filename, final String... expectedResolvedValues) throws TemplateException {
+    // ARRANGE
+    final TemplateVariable variable = helper.createTemplateVariable(resolver, "name", values); //$NON-NLS-1$
+    Mockito.when(mockFile.getName()).thenReturn(filename);
+
+    // ACT
+    final String[] actualResolvedValues = Iterables.toArray(resolver.resolveValues(variable, mockContext), String.class);
+
+    // ASSERT
+    Assert.assertArrayEquals(expectedResolvedValues, actualResolvedValues);
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/SimpleEnumTemplateVariableResolverTest.java b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/SimpleEnumTemplateVariableResolverTest.java
new file mode 100644
index 000000000..e3e19b9d4
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/SimpleEnumTemplateVariableResolverTest.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG 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
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.xtext.ui.templates;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.mockito.Mockito.mock;
+
+import java.util.List;
+
+import org.eclipse.jface.text.templates.TemplateException;
+import org.eclipse.jface.text.templates.TemplateVariable;
+import org.eclipse.xtext.XtextRuntimeModule;
+import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.inject.Guice;
+
+
+public class SimpleEnumTemplateVariableResolverTest {
+
+  private static XtextTemplateContext mockContext;
+  private static TemplateVariableResolverTestHelper helper;
+  private static SimpleEnumTemplateVariableResolver resolver;
+
+  @BeforeClass
+  public static void beforeClass() {
+    mockContext = mock(XtextTemplateContext.class);
+    helper = Guice.createInjector(new XtextRuntimeModule()).getInstance(TemplateVariableResolverTestHelper.class);
+    resolver = new SimpleEnumTemplateVariableResolver();
+  }
+
+  @AfterClass
+  public static void afterClass() {
+    mockContext = null;
+    helper = null;
+    resolver = null;
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testResolveValuesWithNullVariable() {
+    resolver.resolveValues(null, mockContext);
+  }
+
+  public void testResolveValuesWithNoParams() throws TemplateException {
+    testResolveValues();
+  }
+
+  public void testResolveValuesWithOneParam() throws TemplateException {
+    testResolveValues("Value"); //$NON-NLS-1$
+  }
+
+  public void testResolveValuesWithMultipleParams() throws TemplateException {
+    testResolveValues("Value 1", "Value 2", "Value 3"); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+  }
+
+  private void testResolveValues(final Object... values) throws TemplateException {
+    // ARRANGE
+    final TemplateVariable variable = helper.createTemplateVariable(resolver, "name", values); //$NON-NLS-1$
+
+    // ACT
+    final List<String> resolvedValues = resolver.resolveValues(variable, mockContext);
+
+    // ASSERT
+    assertArrayEquals(values, resolvedValues.toArray(new String[resolvedValues.size()]));
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelperTest.xtend b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelperTest.xtend
new file mode 100644
index 000000000..bc0e1dd34
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelperTest.xtend
@@ -0,0 +1,260 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG 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
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.xtext.ui.templates
+
+import com.google.inject.Guice
+import org.eclipse.core.runtime.AssertionFailedException
+import org.eclipse.jface.text.IDocument
+import org.eclipse.jface.text.IRegion
+import org.eclipse.jface.text.Position
+import org.eclipse.jface.text.templates.Template
+import org.eclipse.xtext.XtextRuntimeModule
+import org.eclipse.xtext.ui.editor.templates.XtextTemplateContext
+import org.eclipse.xtext.ui.editor.templates.XtextTemplateContextType
+import org.junit.AfterClass
+import org.junit.BeforeClass
+import org.junit.Test
+
+import static org.junit.Assert.assertArrayEquals
+import static org.junit.Assert.assertEquals
+import static org.mockito.Matchers.anyInt
+import static org.mockito.Mockito.mock
+import static org.mockito.Mockito.spy
+import static org.mockito.Mockito.verify
+import static org.mockito.Mockito.when
+
+public class TemplateProposalProviderHelperTest {
+
+  static val SIMPLE_ENUM_VARIABLE_TYPE = new SimpleEnumTemplateVariableResolver().type
+  static val VARIABLE_NAME = "variableName"
+  static val RETURNED_PATTERN = "Pattern returned from createSimpleEnumPattern()"
+
+  static val TEMPLATE_NAME = "TemplateName"
+  static val TEMPLATE_DESCRIPTION = "Template description"
+  static val CONTEXT_TYPE_ID = "context.type.ID"
+  static val IS_AUTO_INSERTABLE = true
+
+  static var IDocument mockDocument
+  static var Position mockPosition
+  static var IRegion mockRegion
+
+  static var XtextTemplateContext templateContext
+
+  static var TemplateProposalProviderHelper helper
+
+  @BeforeClass
+  def static void beforeClass() {
+    mockDocument = mock(IDocument)
+    mockPosition = mock(Position)
+    mockRegion = mock(IRegion)
+
+    val templateContextType = new XtextTemplateContextType
+    templateContextType.addResolver(new SimpleEnumTemplateVariableResolver)
+    templateContext = new XtextTemplateContext(templateContextType, mockDocument, mockPosition, null, null)
+
+    helper = Guice.createInjector(new XtextRuntimeModule).getInstance(TemplateProposalProviderHelper)
+
+    when(mockDocument.getLineInformationOfOffset(anyInt)).thenReturn(mockRegion)
+    when(mockDocument.get(anyInt, anyInt)).thenReturn("")
+  }
+
+  @AfterClass
+  def static void afterClass() {
+    mockDocument = null
+    mockPosition = null
+    mockRegion = null
+
+    templateContext = null
+
+    helper = null
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateLiteralValuePatternWithNullName() {
+    helper.createLiteralValuePattern(null, 42)
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateLiteralValuePatternWithNameContainingWhitespace() {
+    helper.createLiteralValuePattern("Contains whitespace", 42)
+  }
+
+  def void testCreateLiteralValuePatternWithNullDefaultValue() {
+    testCreateLiteralValuePattern(null, RETURNED_PATTERN, RETURNED_PATTERN)
+  }
+
+  @Test
+  def void testCreateLiteralValuePatternWithFalse() {
+    testCreateLiteralValuePattern(false, RETURNED_PATTERN, RETURNED_PATTERN)
+  }
+
+  @Test
+  def void testCreateLiteralValuePatternWithTrue() {
+    testCreateLiteralValuePattern(true, RETURNED_PATTERN, RETURNED_PATTERN)
+  }
+
+  @Test
+  def void testCreateLiteralValuePatternWithNumber() {
+    testCreateLiteralValuePattern(42, RETURNED_PATTERN, RETURNED_PATTERN)
+  }
+
+  @Test
+  def void testCreateLiteralValuePatternWithString() {
+    testCreateLiteralValuePattern("Supercalifragilisticexpialidocious", RETURNED_PATTERN, '''"«RETURNED_PATTERN»"''')
+  }
+
+  /**
+   * Test createLiteralValuePattern() using a mock createSimpleEnumPattern().
+   *
+   * @param defaultValue    default value to supply to createLiteralValuePattern(), may be {@code null}
+   * @param pattern         pattern to return from createSimpleEnumPattern(), may be {@code null}
+   * @param expectedResult  expected return value from createLiteralValuePattern(), may be {@code null}
+   */
+  def void testCreateLiteralValuePattern(Object defaultValue, String pattern, String expectedResult) {
+
+    // ARRANGE
+    val helperSpy = spy(helper)
+    when(helperSpy.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, defaultValue)).
+      thenReturn(pattern)
+
+    // ACT
+    val actualResult = helperSpy.createLiteralValuePattern(VARIABLE_NAME, defaultValue)
+
+    // ASSERT
+    verify(helperSpy).createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, defaultValue)
+    assertEquals(expectedResult, actualResult)
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateTemplateVariablePatternWithNullType() {
+    helper.createTemplateVariablePattern(null, VARIABLE_NAME)
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateTemplateVariablePatternWithTypeContainingWhitespace() {
+    helper.createTemplateVariablePattern("Contains whitespace", VARIABLE_NAME)
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateTemplateVariablePatternWithNullName() {
+    helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, null)
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateTemplateVariablePatternWithNameContainingWhitespace() {
+    helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, "Contains whitespace")
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateTemplateVariablePatternWithNull() {
+    helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, null)
+  }
+
+  @Test(expected=AssertionFailedException)
+  def void testCreateTemplateVariablePatternWithNoValues() {
+    helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME)
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithFalse() {
+    testCreateTemplateVariablePattern(#[false], "false", #["false", "true"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithTrue() {
+    testCreateTemplateVariablePattern(#[true], "true", #["true", "false"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithMultipleBooleans() {
+    testCreateTemplateVariablePattern(#[false, false, true], "false", #["false", "false", "true"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithNumber() {
+    testCreateTemplateVariablePattern(#[42], "42", #["42"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithMultipleNumbers() {
+    testCreateTemplateVariablePattern(#[1297, 1314], "1297", #["1297", "1314"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithString() {
+    testCreateTemplateVariablePattern(#["Supercalifragilisticexpialidocious"], "Supercalifragilisticexpialidocious",
+      #["Supercalifragilisticexpialidocious"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithEmptyString() {
+    testCreateTemplateVariablePattern(#[""], "", #[""])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithStringContainingWhitespace() {
+    testCreateTemplateVariablePattern(#["Lorem ipsum dolor sit amet"], "Lorem ipsum dolor sit amet",
+      #["Lorem ipsum dolor sit amet"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithStringContainingSingleQuotes() {
+    testCreateTemplateVariablePattern(#["Apostrophe's"], "Apostrophe's", #["Apostrophe's"])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithStringContainingDoubleQuotes() {
+    testCreateTemplateVariablePattern(#['''CHAIN "CHUCKIE"'''.toString], '''CHAIN \"CHUCKIE\"''',
+      #['''CHAIN \"CHUCKIE\"'''])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithStringContainingWhitespaceAndSingleAndDoubleQuotes() {
+    testCreateTemplateVariablePattern(
+      #['''"Whoever thinks of going to bed before twelve o'clock is a scoundrel" - Dr Johnson'''.
+        toString], '''\"Whoever thinks of going to bed before twelve o'clock is a scoundrel\" - Dr Johnson''',
+      #['''\"Whoever thinks of going to bed before twelve o'clock is a scoundrel\" - Dr Johnson'''])
+  }
+
+  @Test
+  def void testCreateTemplateVariablePatternWithMultipleStrings() {
+    testCreateTemplateVariablePattern(
+      #["Twas brillig and the slithy toves", "Did gyre and gimble in the wabe", "All mimsy were the borogroves",
+        "And the mome raths outgrabe"], "Twas brillig and the slithy toves",
+      #["Twas brillig and the slithy toves", "Did gyre and gimble in the wabe", "All mimsy were the borogroves",
+        "And the mome raths outgrabe"])
+  }
+
+  /**
+   * Test createTemplateVariablePattern().
+   *
+   * @param values          values, may be {@code null}
+   * @param expectedResult  expected result of applying a template containing the pattern, may be {@code null}
+   * @param expectedValues  expected values offered by a template containing the pattern, may be {@code null}
+   */
+  private def void testCreateTemplateVariablePattern(Object[] values, String expectedResult, String[] expectedValues) {
+    // ACT
+    val pattern = helper.createTemplateVariablePattern(SIMPLE_ENUM_VARIABLE_TYPE, VARIABLE_NAME, values)
+
+    // Try using the pattern in a template
+    val template = new Template(TEMPLATE_NAME, TEMPLATE_DESCRIPTION, CONTEXT_TYPE_ID, pattern, IS_AUTO_INSERTABLE)
+    val templateBuffer = templateContext.evaluate(template)
+    val actualResult = templateBuffer.string
+    assertEquals(1, templateBuffer.variables.length)
+    val actualValues = templateBuffer.variables.get(0).values
+
+    // ASSERT
+    assertEquals(expectedResult, actualResult)
+    assertArrayEquals(expectedValues, actualValues)
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
new file mode 100644
index 000000000..7a78b1f67
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateVariableResolverTestHelper.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Avaloq Evolution AG 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
+ *
+ * Contributors:
+ *     Avaloq Evolution AG - initial API and implementation
+ *******************************************************************************/
+
+package com.avaloq.tools.ddk.xtext.ui.templates;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.jface.text.templates.TemplateException;
+import org.eclipse.jface.text.templates.TemplateTranslator;
+import org.eclipse.jface.text.templates.TemplateVariable;
+import org.eclipse.jface.text.templates.TemplateVariableResolver;
+
+import com.google.inject.Inject;
+
+
+/**
+ * Common methods for testing implementations of {@link TemplateVariableResolver}
+ */
+public class TemplateVariableResolverTestHelper {
+
+  @Inject
+  private TemplateProposalProviderHelper helper;
+
+  private final TemplateTranslator translator = new TemplateTranslator();
+
+  /**
+   * Create a {@link TemplateVariable}.
+   *
+   * @param resolver
+   *          {@link TemplateVariableResolver@} of the type which will resolve the {@link TemplateVariable} created, may not be {@code null}
+   * @param name
+   *          the name of the variable, may not be {@code null}
+   * @param values
+   *          the values available at this variable, non-empty, may not be {@code null}
+   * @return a {@link TemplateVariable}
+   * @throws TemplateException
+   *           if translation failed
+   */
+  public TemplateVariable createTemplateVariable(final TemplateVariableResolver resolver, final String name, final Object... values) throws TemplateException {
+
+    // Jump through hoops to create a real TemplateVariable because TemplateVariableType is final thus cannot be mocked,
+    // and has protected constructors thus cannot be directly instantiated
+    final String pattern = helper.createTemplateVariablePattern(resolver.getType(), name, values);
+    final TemplateVariable[] variables = translator.translate(pattern).getVariables();
+    assertEquals(1, variables.length);
+    return variables[0];
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/test/XtextUiTestSuite.java b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/test/XtextUiTestSuite.java
index 36e18dea0..3c6a284ef 100644
--- a/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/test/XtextUiTestSuite.java
+++ b/com.avaloq.tools.ddk.xtext.ui.test/src/com/avaloq/tools/ddk/xtext/ui/test/XtextUiTestSuite.java
@@ -16,6 +16,9 @@
 import com.avaloq.tools.ddk.test.core.junit.runners.DiscerningSuite;
 import com.avaloq.tools.ddk.xtext.ui.quickfix.WorkbenchResolutionAdaptorRunTest;
 import com.avaloq.tools.ddk.xtext.ui.quickfix.WorkbenchResolutionAdaptorTest;
+import com.avaloq.tools.ddk.xtext.ui.templates.ResourceNameTemplateVariableResolverTest;
+import com.avaloq.tools.ddk.xtext.ui.templates.SimpleEnumTemplateVariableResolverTest;
+import com.avaloq.tools.ddk.xtext.ui.templates.TemplateProposalProviderHelperTest;
 
 
 /**
@@ -25,7 +28,10 @@
 @DiscerningSuite.SuiteClasses({
   // @Format-Off
   WorkbenchResolutionAdaptorTest.class,
-  WorkbenchResolutionAdaptorRunTest.class
+  WorkbenchResolutionAdaptorRunTest.class,
+  SimpleEnumTemplateVariableResolverTest.class,
+  ResourceNameTemplateVariableResolverTest.class,
+  TemplateProposalProviderHelperTest.class
   // @Format-On
 })
 public class XtextUiTestSuite {}
diff --git a/com.avaloq.tools.ddk.xtext.ui.test/xtend-gen/.gitignore b/com.avaloq.tools.ddk.xtext.ui.test/xtend-gen/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/com.avaloq.tools.ddk.xtext.ui/.classpath b/com.avaloq.tools.ddk.xtext.ui/.classpath
index 8118c41c5..cbb9455e8 100644
--- a/com.avaloq.tools.ddk.xtext.ui/.classpath
+++ b/com.avaloq.tools.ddk.xtext.ui/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
diff --git a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
index 50fac0893..2cc2b010c 100644
--- a/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.xtext.ui/META-INF/MANIFEST.MF
@@ -1,31 +1,34 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: com.avaloq.tools.ddk.xtext.ui
-Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: Avaloq Evolution AG
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Require-Bundle: com.avaloq.tools.ddk.xtext,
- org.eclipse.xtext.ui,
- org.eclipse.xtext.ui.shared,
- org.eclipse.search,
- org.eclipse.ui.ide,
- org.apache.commons.lang,
- com.avaloq.tools.ddk.check.runtime.ui;visibility:=reexport
-Export-Package: com.avaloq.tools.ddk.xtext.ui,
- com.avaloq.tools.ddk.xtext.ui.editor,
- com.avaloq.tools.ddk.xtext.ui.editor.findrefs,
- com.avaloq.tools.ddk.xtext.ui.editor.model,
- com.avaloq.tools.ddk.xtext.ui.editor.model.edit,
- com.avaloq.tools.ddk.xtext.ui.editor.templates,
- com.avaloq.tools.ddk.xtext.ui.hover,
- com.avaloq.tools.ddk.xtext.ui.labeling,
- com.avaloq.tools.ddk.xtext.ui.outline,
- com.avaloq.tools.ddk.xtext.ui.quickfix,
- com.avaloq.tools.ddk.xtext.ui.syntaxcoloring,
- com.avaloq.tools.ddk.xtext.ui.templates,
- com.avaloq.tools.ddk.xtext.ui.util,
- com.avaloq.tools.ddk.xtext.ui.validation,
- com.avaloq.tools.ddk.xtext.ui.validation.preferences
-Import-Package: org.apache.log4j
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: com.avaloq.tools.ddk.xtext.ui
+Bundle-SymbolicName: com.avaloq.tools.ddk.xtext.ui;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Vendor: Avaloq Evolution AG
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Require-Bundle: com.avaloq.tools.ddk.xtext,
+ org.eclipse.jdt.core,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.search,
+ org.eclipse.ui.ide,
+ org.apache.commons.lang,
+ com.avaloq.tools.ddk.check.runtime.ui;visibility:=reexport,
+ com.google.guava
+Export-Package: com.avaloq.tools.ddk.xtext.ui,
+ com.avaloq.tools.ddk.xtext.ui.editor,
+ com.avaloq.tools.ddk.xtext.ui.editor.findrefs,
+ com.avaloq.tools.ddk.xtext.ui.editor.model,
+ com.avaloq.tools.ddk.xtext.ui.editor.model.edit,
+ com.avaloq.tools.ddk.xtext.ui.editor.templates,
+ com.avaloq.tools.ddk.xtext.ui.hover,
+ com.avaloq.tools.ddk.xtext.ui.labeling,
+ com.avaloq.tools.ddk.xtext.ui.outline,
+ com.avaloq.tools.ddk.xtext.ui.quickfix,
+ com.avaloq.tools.ddk.xtext.ui.syntaxcoloring,
+ com.avaloq.tools.ddk.xtext.ui.templates,
+ com.avaloq.tools.ddk.xtext.ui.util,
+ com.avaloq.tools.ddk.xtext.ui.validation,
+ com.avaloq.tools.ddk.xtext.ui.validation.preferences
+Import-Package: org.apache.log4j
diff --git a/com.avaloq.tools.ddk.xtext.ui/build.properties b/com.avaloq.tools.ddk.xtext.ui/build.properties
index 3466223bf..6d2b56e64 100644
--- a/com.avaloq.tools.ddk.xtext.ui/build.properties
+++ b/com.avaloq.tools.ddk.xtext.ui/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 bin.includes = META-INF/,\
                icons/,\
                schema/,\
diff --git a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/ResourceNameTemplateVariableResolver.java b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolver.java
similarity index 72%
rename from com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/ResourceNameTemplateVariableResolver.java
rename to com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolver.java
index 0e471d055..8788d8b47 100644
--- a/com.avaloq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/templates/ResourceNameTemplateVariableResolver.java
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/ResourceNameTemplateVariableResolver.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Evolution AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.check.ui.templates;
+package com.avaloq.tools.ddk.xtext.ui.templates;
 
 import java.util.List;
 
@@ -31,14 +31,14 @@
 
 
 /**
- * The Class PackageNameResolver.
+ * Resolves a resource name.
  */
 public class ResourceNameTemplateVariableResolver extends AbstractTemplateVariableResolver {
 
   private static final Logger LOGGER = Logger.getLogger(ResourceNameTemplateVariableResolver.class);
 
   public ResourceNameTemplateVariableResolver() {
-    super("ResourceName", "Resolves the current package name");
+    super("ResourceName", "Resolves a resource name"); //$NON-NLS-1$ //$NON-NLS-2$
   }
 
   @Override
@@ -51,17 +51,21 @@ public List<String> resolveValues(final TemplateVariable variable, final XtextTe
       final IXtextDocument xtextDocument = (IXtextDocument) document;
       IFile file = xtextDocument.getAdapter(IFile.class);
 
-      if ("package".equals(variableName) && document instanceof IXtextDocument) {
-        if (file != null && file.getParent() instanceof IFolder) {
-          IJavaProject javaProject = JavaCore.create(file.getProject());
-          try {
-            IPackageFragment packageFragment = javaProject.findPackageFragment(file.getParent().getFullPath());
-            result.add(packageFragment.getElementName());
-          } catch (JavaModelException e) {
-            LOGGER.error("Could not determine package for file of given document");
+      switch (variableName) {
+      case "package": //$NON-NLS-1$
+        if (document instanceof IXtextDocument) { // $NON-NLS-1$
+          if (file != null && file.getParent() instanceof IFolder) {
+            IJavaProject javaProject = JavaCore.create(file.getProject());
+            try {
+              IPackageFragment packageFragment = javaProject.findPackageFragment(file.getParent().getFullPath());
+              result.add(packageFragment.getElementName());
+            } catch (JavaModelException e) {
+              LOGGER.error("Could not determine package for file of given document"); //$NON-NLS-1$
+            }
           }
         }
-      } else if ("catalog".equals(variableName)) {
+        break;
+      case "file": //$NON-NLS-1$
         final String fileName = file.getName();
         result.add(fileName.indexOf('.') > 0 ? fileName.substring(0, fileName.lastIndexOf('.')) : fileName);
       }
@@ -69,4 +73,3 @@ public List<String> resolveValues(final TemplateVariable variable, final XtextTe
     return Lists.newArrayList(Iterables.filter(result, Predicates.notNull()));
   }
 }
-
diff --git a/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend
new file mode 100644
index 000000000..de92832de
--- /dev/null
+++ b/com.avaloq.tools.ddk.xtext.ui/src/com/avaloq/tools/ddk/xtext/ui/templates/TemplateProposalProviderHelper.xtend
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2016 Avaloq Evolution AG 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
+ * Contributors:
+ * Avaloq Evolution AG - initial API and implementation
+ */
+package com.avaloq.tools.ddk.xtext.ui.templates
+
+import com.google.inject.Singleton
+import org.apache.commons.lang.ArrayUtils
+import org.apache.commons.lang.StringEscapeUtils
+import org.eclipse.core.runtime.Assert
+import org.eclipse.jface.text.templates.Template
+import org.eclipse.xtext.ui.editor.contentassist.ITemplateProposalProvider
+
+/**
+ * Helper methods for {@link ITemplateProposalProvider} implementations.
+ */
+@Singleton
+class TemplateProposalProviderHelper {
+
+  static val SIMPLE_ENUM_TYPE = new SimpleEnumTemplateVariableResolver().type
+
+  /**
+   * Create a literal value pattern, including quotes if necessary, for a {@link Template}.
+   *
+   * @param name          the name of the variable, may not be {@code null} nor contain whitespace
+   * @param defaultValue  default value, may be {@code null}
+   * @return  pattern, never {@code null}
+   * @throws  {@link IllegalArgumentException}  if name is null or contains whitespace
+   */
+  def String createLiteralValuePattern(String name, Object defaultValue) throws IllegalArgumentException {
+    val pattern = createTemplateVariablePattern(SIMPLE_ENUM_TYPE, name, defaultValue)
+
+    return if (defaultValue instanceof String) {
+      // Surround pattern with quotes
+      '''"«pattern»"'''
+    } else {
+      pattern
+    }
+  }
+
+  /**
+   * Create a variable pattern for a {@link Template}.
+   *
+   * @param   type    the type of the variable, may not be {@code null} nor contain whitespace
+   * @param   name    the name of the variable, may not be {@code null} nor contain whitespace
+   * @param   values  the values available at this variable, may not be {@code null} nor empty
+   * @return  pattern, never {@code null}
+   * @throws  {@link AssertionFailedException}  if type or name is null or contains whitespace, or values is null or empty
+   */
+  def String createTemplateVariablePattern(String type, String name, Object... values) throws IllegalArgumentException {
+
+    Assert.isNotNull(type);
+    Assert.isTrue(!type.chars().anyMatch[Character.isWhitespace(it)]);
+    Assert.isNotNull(name);
+    Assert.isTrue(!name.chars().anyMatch[Character.isWhitespace(it)]);
+    Assert.isTrue(!ArrayUtils.isEmpty(values));
+
+    val Object[] useValues = if (values.length == 1 && values.get(0) instanceof Boolean) {
+        // Offer both false and true as dropdown options
+        #[values.get(0), !(values.get(0) as Boolean)]
+      } else {
+        values
+      }
+
+    val sanitisedValues = useValues.map [
+      // Escape double-quotes to comply with string grammar.
+      // Double-up single-quotes to comply with template pattern grammar.
+      // Wrap each value in single quotes.
+      "'" + StringEscapeUtils::escapeJava(String.valueOf(it)).replace("'", "''") + "'"
+    ]
+
+    return '''${«name»:«type»(«String.join(", ", sanitisedValues)»)}'''
+  }
+
+}
diff --git a/com.avaloq.tools.ddk.xtext.ui/xtend-gen/.gitignore b/com.avaloq.tools.ddk.xtext.ui/xtend-gen/.gitignore
new file mode 100644
index 000000000..e69de29bb