Added support for Windows end of line in completion proposals.

eclipse-acceleo · Jan 25, 2024 · fa89664 · fa89664
1 parent 2daba17
commit fa89664
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/....aql/src/org/eclipse/acceleo/aql/completion/proposals/QueryServiceCompletionProposal.java b/....aql/src/org/eclipse/acceleo/aql/completion/proposals/QueryServiceCompletionProposal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -62,7 +62,8 @@ public String getDescription() {
 		final String res;
 
 		if (service.getOrigin().getDocumentation() != null) {
-			res = service.getOrigin().getDocumentation().getBody().getValue().replace("\n", "<br>");
+			res = service.getOrigin().getDocumentation().getBody().getValue().replaceAll("(\\r\\n)|\\n",
+					"<br>");
 		} else {
 			res = "";
 		}

diff --git a/...l/src/org/eclipse/acceleo/aql/completion/proposals/TemplateServiceCompletionProposal.java b/...l/src/org/eclipse/acceleo/aql/completion/proposals/TemplateServiceCompletionProposal.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2024 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -62,7 +62,8 @@ public String getDescription() {
 		final String res;
 
 		if (service.getOrigin().getDocumentation() != null) {
-			res = service.getOrigin().getDocumentation().getBody().getValue().replace("\n", "<br>");
+			res = service.getOrigin().getDocumentation().getBody().getValue().replaceAll("(\\r\\n)|\\n",
+					"<br>");
 		} else {
 			res = "";
 		}