[107647] [CSS Editor] Line delimiter setting ignored

1 files changed, 10 insertions, 0 deletions

diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java
index 9ab8cc24ce..31bb2c5a05 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/internal/encoding/DTDDocumentLoader.java
@@ -12,13 +12,16 @@
  *******************************************************************************/
 package org.eclipse.wst.dtd.core.internal.encoding;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.wst.dtd.core.internal.parser.DTDRegionParser;
+import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
 import org.eclipse.wst.dtd.core.internal.text.DTDStructuredDocumentReParser;
 import org.eclipse.wst.dtd.core.internal.text.StructuredTextPartitionerForDTD;
 import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
 import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
 import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
+import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
 import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
 import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
@@ -45,6 +48,13 @@ public final class DTDDocumentLoader extends AbstractDocumentLoader {
 	public RegionParser getParser() {
 		return new DTDRegionParser();
 	}
+	
+	protected String getPreferredNewLineDelimiter(IFile file) {
+		String delimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForDTD.ContentTypeID_DTD);
+		if (delimiter == null)
+			delimiter = super.getPreferredNewLineDelimiter(file);
+		return delimiter;
+	}
 
 	protected String getSpecDefaultEncoding() {
 		String enc = "UTF-8"; //$NON-NLS-1$