Fixed migration of comment block.

eclipse-acceleo · Dec 14, 2023 · f867984 · f867984
1 parent f401537
commit f867984
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 3 deletions.
diff --git a/...celeo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/ModuleConverter.java b/...celeo.aql.migration/src/org/eclipse/acceleo/aql/migration/converters/ModuleConverter.java
@@ -614,9 +614,17 @@ private Object caseDocumentation(org.eclipse.acceleo.model.mtl.Documentation inp
 	}
 
 	private Object caseComment(org.eclipse.acceleo.model.mtl.Comment inputComment) {
-		Comment outputComment = AcceleoFactory.eINSTANCE.createComment();
-		CommentBody commentBody = AcceleoFactory.eINSTANCE.createCommentBody();
-		commentBody.setValue(inputComment.getBody().getValue().substring(1));
+		final String commentValue;
+		final Comment outputComment;
+		if (inputComment.getBody().getValue().contains("/]")) {
+			outputComment = AcceleoFactory.eINSTANCE.createBlockComment();
+			commentValue = inputComment.getBody().getValue();
+		} else {
+			outputComment = AcceleoFactory.eINSTANCE.createComment();
+			commentValue = inputComment.getBody().getValue().substring(1);
+		}
+		final CommentBody commentBody = AcceleoFactory.eINSTANCE.createCommentBody();
+		commentBody.setValue(commentValue);
 		outputComment.setBody(commentBody);
 		return outputComment;
 	}

diff --git a/...acceleo3/src/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery.mtl b/...acceleo3/src/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery.mtl
@@ -0,0 +1,3 @@
+[module commentedQuery('http://www.eclipse.org/emf/2002/Ecore')/]
+
+[comment][query public myQuery(myParam : ecore::EPackage) : ecore::EClassifier = myParam.eClassifiers->first()/][/comment]
diff --git a/...sts/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery-expected.mtl b/...sts/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery-expected.mtl
@@ -0,0 +1,3 @@
+[module commentedQuery('http://www.eclipse.org/emf/2002/Ecore')/]
+
+[comment][query public myQuery(myParam : ecore::EPackage) : ecore::EClassifier = myParam.eClassifiers->first()/][/comment]
diff --git a/...tests/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery-origin.mtl b/...tests/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery-origin.mtl
@@ -0,0 +1,3 @@
+[module commentedQuery('http://www.eclipse.org/emf/2002/Ecore')/]
+
+[comment][query public myQuery(myParam : ecore::EPackage) : ecore::EClassifier = myParam.eClassifiers->first()/][/comment]
diff --git a/...ation.tests/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery.emtl b/...ation.tests/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery.emtl
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI 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" xmlns:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
+  <mtl:Module name="commentedQuery" nsURI="resources::acceleoAqlTests::language::comment::commentedQuery::commentedQuery" endHeaderPosition="63">
+    <input>
+      <takesTypesFrom href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+    </input>
+    <ownedModuleElement xsi:type="mtl:Comment">
+      <body startPosition="76" endPosition="179" value="[query public myQuery(myParam : ecore::EPackage) : ecore::EClassifier = myParam.eClassifiers->first()/]"/>
+    </ownedModuleElement>
+  </mtl:Module>
+  <ecore:EPackage name="additions">
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_String_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Integer_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Real_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ecore_EObject_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_OclAny_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Collection(T)_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_Sequence(T)_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="oclstdlib_OrderedSet(T)_Class">
+      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
+      </eAnnotations>
+    </eClassifiers>
+  </ecore:EPackage>
+  <ocl.ecore:Variable name="self">
+    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+  </ocl.ecore:Variable>
+  <ecore:EAnnotation source="positions">
+    <eAnnotations source="positions.0" references="/0/%">
+      <details key="start" value="67"/>
+      <details key="end" value="189"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+  </ecore:EAnnotation>
+</xmi:XMI>
diff --git a/...ration.tests/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery.mtl b/...ration.tests/resources/acceleoAqlTests/language/comment/commentedQuery/commentedQuery.mtl
@@ -0,0 +1,3 @@
+[module commentedQuery('http://www.eclipse.org/emf/2002/Ecore')/]
+
+[comment][query public myQuery(myParam : ecore::EPackage) : ecore::EClassifier = myParam.eClassifiers->first()/][/comment]