Attachment #43550 for bug #115716

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.





	protected void formatIndentationAfterNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
		// [111674] If inside xml:space="preserve" element, we bail
		if (formatContraints.getInPreserveSpaceElement())
			return;
		if (node != null) {
			IDOMNode nextSibling = (IDOMNode) node.getNextSibling();
			IStructuredDocument doc = node.getModel().getStructuredDocument();

			String lineDelimiter = doc.getLineDelimiter();
			try {
				lineDelimiter = doc.getLineDelimiter(line);
				if (lineDelimiter == null)
					lineDelimiter = ""; //$NON-NLS-1$
			}
			catch (BadLocationException e) {
				// log for now, unless we find reason not to
				Logger.log(Logger.INFO, e.getMessage());
			}
			// BUG115716: if cannot get line delimiter from current line, just
			// use default line delimiter
			if (lineDelimiter == null)
				lineDelimiter = doc.getLineDelimiter();

			if (node.getParentNode() != null) {
				if (node.getParentNode().getNodeType() == Node.DOCUMENT_NODE)


	protected void formatIndentationBeforeNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
		// [111674] If inside xml:space="preserve" element, we bail
		if (formatContraints.getInPreserveSpaceElement())
			return;
		if (node != null) {
			IDOMNode previousSibling = (IDOMNode) node.getPreviousSibling();
			IStructuredDocument doc = node.getModel().getStructuredDocument();

	 */
	protected void formatTrailingText(IDOMNode node, IStructuredFormatContraints formatContraints) {
		// [111674] If inside xml:space="preserve" element, we bail
		if (formatContraints.getInPreserveSpaceElement())
			return;

		String lineDelimiter = node.getModel().getStructuredDocument().getLineDelimiter();
		String lineIndent = formatContraints.getCurrentIndent();

Return to bug 115716

Lines 161-167 Link Here

(-)src/org/eclipse/wst/xml/core/internal/provisional/format/NodeFormatter.java (-5 / +10 lines)
161		161
162	protected void formatIndentationAfterNode(IDOMNode node, IStructuredFormatContraints formatContraints) {	162	protected void formatIndentationAfterNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
163	// [111674] If inside xml:space="preserve" element, we bail	163	// [111674] If inside xml:space="preserve" element, we bail
164	if (formatContraints.getInPreserveSpaceElement()) return;	164	if (formatContraints.getInPreserveSpaceElement())
		165	return;
165	if (node != null) {	166	if (node != null) {
166	IDOMNode nextSibling = (IDOMNode) node.getNextSibling();	167	IDOMNode nextSibling = (IDOMNode) node.getNextSibling();
167	IStructuredDocument doc = node.getModel().getStructuredDocument();	168	IStructuredDocument doc = node.getModel().getStructuredDocument();
Lines 169-181 Link Here
169	String lineDelimiter = doc.getLineDelimiter();	170	String lineDelimiter = doc.getLineDelimiter();
170	try {	171	try {
171	lineDelimiter = doc.getLineDelimiter(line);	172	lineDelimiter = doc.getLineDelimiter(line);
172	if (lineDelimiter == null)
173	lineDelimiter = ""; //$NON-NLS-1$
174	}	173	}
175	catch (BadLocationException e) {	174	catch (BadLocationException e) {
176	// log for now, unless we find reason not to	175	// log for now, unless we find reason not to
177	Logger.log(Logger.INFO, e.getMessage());	176	Logger.log(Logger.INFO, e.getMessage());
178	}	177	}
		178	// BUG115716: if cannot get line delimiter from current line, just
		179	// use default line delimiter
		180	if (lineDelimiter == null)
		181	lineDelimiter = doc.getLineDelimiter();
179		182
180	if (node.getParentNode() != null) {	183	if (node.getParentNode() != null) {
181	if (node.getParentNode().getNodeType() == Node.DOCUMENT_NODE)	184	if (node.getParentNode().getNodeType() == Node.DOCUMENT_NODE)
Lines 243-249 Link Here
243		246
244	protected void formatIndentationBeforeNode(IDOMNode node, IStructuredFormatContraints formatContraints) {	247	protected void formatIndentationBeforeNode(IDOMNode node, IStructuredFormatContraints formatContraints) {
245	// [111674] If inside xml:space="preserve" element, we bail	248	// [111674] If inside xml:space="preserve" element, we bail
246	if (formatContraints.getInPreserveSpaceElement()) return;	249	if (formatContraints.getInPreserveSpaceElement())
		250	return;
247	if (node != null) {	251	if (node != null) {
248	IDOMNode previousSibling = (IDOMNode) node.getPreviousSibling();	252	IDOMNode previousSibling = (IDOMNode) node.getPreviousSibling();
249	IStructuredDocument doc = node.getModel().getStructuredDocument();	253	IStructuredDocument doc = node.getModel().getStructuredDocument();
Lines 328-334 Link Here
328	*/	332	*/
329	protected void formatTrailingText(IDOMNode node, IStructuredFormatContraints formatContraints) {	333	protected void formatTrailingText(IDOMNode node, IStructuredFormatContraints formatContraints) {
330	// [111674] If inside xml:space="preserve" element, we bail	334	// [111674] If inside xml:space="preserve" element, we bail
331	if (formatContraints.getInPreserveSpaceElement()) return;	335	if (formatContraints.getInPreserveSpaceElement())
		336	return;
332		337
333	String lineDelimiter = node.getModel().getStructuredDocument().getLineDelimiter();	338	String lineDelimiter = node.getModel().getStructuredDocument().getLineDelimiter();
334	String lineIndent = formatContraints.getCurrentIndent();	339	String lineIndent = formatContraints.getCurrentIndent();