Merge pull request #366 from eclipse/sz_bug476690

Refined token placement for indentation based languages

org.eclipse.xtext.ide.tests/.classpath

@@ -8,6 +8,7 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry including="**/*.java|**/*.xtend" kind="src" path="suites"/>
 	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>

org.eclipse.xtext.ide.tests/build.gradle

@@ -13,12 +13,18 @@ dependencies {
 sourceSets.test.java {
 	srcDir 'testlang-src'
 	srcDir 'testlang-src-gen'
+	srcDir 'suites'
 }
+
 sourceSets.test.resources {
 	srcDir 'testlang-src'
 	srcDir 'testlang-src-gen'
 }
 
+test {   
+   exclude '**/*Suite.class'
+}
+
 task generateTestLanguages(type: XtextGeneratorTask) {
 	workflow = file('testlang-src/org/eclipse/xtext/ide/tests/testlanguage/GenerateTestLanguage.mwe2')
 	inputs.file 'testlang-src/org/eclipse/xtext/ide/tests/testlanguage/TestLanguage.xtext'

org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.ecore

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="indentationAwareUiTestLanguage" nsURI="http://www.eclipse.org/xtext/ide/tests/testlanguage/IndentationAwareUiTestLanguage"
+    nsPrefix="indentationAwareUiTestLanguage">
+  <eClassifiers xsi:type="ecore:EClass" name="Tree">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+        eType="#//TreeNode" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="moreNodes" upperBound="-1"
+        eType="#//OtherTreeNode" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TreeNode">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+        eType="#//TreeNode" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="OtherTreeNode">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="childList" eType="#//ChildList"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ChildList">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+        eType="#//OtherTreeNode" containment="true"/>
+  </eClassifiers>
+</ecore:EPackage>

org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016 TypeFox GmbH (http://www.typefox.io) and others.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html"
+    modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests"
+    forceOverwrite="true" modelName="IndentationAwareUiTestLanguage" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="6.0"
+    copyrightFields="false" runtimeVersion="2.12">
+  <genPackages prefix="IndentationAwareUiTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
+      disposableProviderFactory="true" fileExtensions="indentationAwareUiTestLang"
+      ecorePackage="IndentationAwareUiTestLanguage.ecore#/">
+    <genClasses ecoreClass="IndentationAwareUiTestLanguage.ecore#//Tree">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IndentationAwareUiTestLanguage.ecore#//Tree/nodes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IndentationAwareUiTestLanguage.ecore#//Tree/moreNodes"/>
+    </genClasses>
+    <genClasses ecoreClass="IndentationAwareUiTestLanguage.ecore#//TreeNode">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute IndentationAwareUiTestLanguage.ecore#//TreeNode/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IndentationAwareUiTestLanguage.ecore#//TreeNode/children"/>
+    </genClasses>
+    <genClasses ecoreClass="IndentationAwareUiTestLanguage.ecore#//OtherTreeNode">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute IndentationAwareUiTestLanguage.ecore#//OtherTreeNode/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IndentationAwareUiTestLanguage.ecore#//OtherTreeNode/childList"/>
+    </genClasses>
+    <genClasses ecoreClass="IndentationAwareUiTestLanguage.ecore#//ChildList">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference IndentationAwareUiTestLanguage.ecore#//ChildList/children"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>