Attachment #188926 for bug #335309

View | Details | Raw Unified | Return to bug 335309
Collapse All | Expand All




	Map formatterOptions;

	static {
//		TESTS_NUMBERS = new int[] { 738 };
//		TESTS_RANGE = new int[] { 734, -1 };
	}
	public static Test suite() {

		"}\n"
	);
}
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=332843
public void test738() {
	final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
	IRegion[] regions = new IRegion[] {
			new Region(705, 0)
	};
	runTest(codeFormatter, "test738", "RecipeDocumentProvider.java", CodeFormatter.K_COMPILATION_UNIT, 0, true, regions, "\n");//$NON-NLS-1$ //$NON-NLS-2$
}
}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.recipeeditor;

import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.rules.FastPartitioner;
import org.eclipse.jface.text.rules.IPredicateRule;
import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.ui.editors.text.FileDocumentProvider;

public class RecipeDocumentProvider extends FileDocumentProvider {
	/**
	 * The recipe partitioning. It contains two partition types: {@link #RECIPE_CODE} and
	 * {@link #RECIPE_COMMENT}.
	 */
	public static final String RECIPE_PARTITIONING= "org.recipeeditor.recipepartitioning"; //$NON-NLS-1$

	/**
	 * The identifier of the comment body type.
	 */
	public static final String RECIPE_CODE= IDocument.DEFAULT_CONTENT_TYPE;
	/**
	 * The identifier of the comment partition type.
	 */
	public static final String RECIPE_COMMENT= "RECIPE_COMMENT"; //$NON-NLS-1$
	
	private static final String[] CONTENT_TYPES= {
			RECIPE_CODE,
			RECIPE_COMMENT
	};

	protected void setupDocument(Object element,IDocument document) {
		if (document instanceof IDocumentExtension3) {
			IDocumentExtension3 ext= (IDocumentExtension3) document;
			IDocumentPartitioner partitioner= createRecipePartitioner();
			ext.setDocumentPartitioner(RECIPE_PARTITIONING, partitioner);
			partitioner.connect(document);
		}
	}

	private IDocumentPartitioner createRecipePartitioner() {
		IPredicateRule[] rules= { new SingleLineRule("#", null, new Token(RECIPE_COMMENT), (char) 0, true, false) }; //$NON-NLS-1$

		RuleBasedPartitionScanner scanner= new RuleBasedPartitionScanner();
		scanner.setPredicateRules(rules);
		
		return new FastPartitioner(scanner, CONTENT_TYPES);
	}

}




/*******************************************************************************
 * Copyright (c) 2006 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.recipeeditor;

import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.rules.FastPartitioner;
import org.eclipse.jface.text.rules.IPredicateRule;
import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.ui.editors.text.FileDocumentProvider;

public class RecipeDocumentProvider extends FileDocumentProvider {
	/**
	 * The recipe partitioning. It contains two partition types: {@link #RECIPE_CODE} and
	 * {@link #RECIPE_COMMENT}.
	 */
	public static final String RECIPE_PARTITIONING= "org.recipeeditor.recipepartitioning"; //$NON-NLS-1$

	/**
	 * The identifier of the comment body type.
	 */
	public static final String RECIPE_CODE= IDocument.DEFAULT_CONTENT_TYPE;
	/**
	 * The identifier of the comment partition type.
	 */
	public static final String RECIPE_COMMENT= "RECIPE_COMMENT"; //$NON-NLS-1$
	
	private static final String[] CONTENT_TYPES= {
			RECIPE_CODE,
			RECIPE_COMMENT
	};

	protected void setupDocument(Object element,IDocument document) {
		if (document instanceof IDocumentExtension3) {
			IDocumentExtension3 ext= (IDocumentExtension3) document;
			IDocumentPartitioner partitioner= createRecipePartitioner();
			ext.setDocumentPartitioner(RECIPE_PARTITIONING, partitioner);
			partitioner.connect(document);
		}
	}

	private IDocumentPartitioner createRecipePartitioner() {
		IPredicateRule[] rules= { new SingleLineRule("#", null, new Token(RECIPE_COMMENT), (char) 0, true, false) }; //$NON-NLS-1$

		RuleBasedPartitionScanner scanner= new RuleBasedPartitionScanner();
		scanner.setPredicateRules(rules);
		
		return new FastPartitioner(scanner, CONTENT_TYPES);
	}

}

Return to bug 335309

Lines 62-68 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/FormatterRegressionTests.java (-1 / +11 lines)
62	Map formatterOptions;	62	Map formatterOptions;
63		63
64	static {	64	static {
65	// TESTS_NUMBERS = new int[] { 736 };	65	// TESTS_NUMBERS = new int[] { 738 };
66	// TESTS_RANGE = new int[] { 734, -1 };	66	// TESTS_RANGE = new int[] { 734, -1 };
67	}	67	}
68	public static Test suite() {	68	public static Test suite() {
Lines 11102-11105 Link Here
11102	"}\n"	11102	"}\n"
11103	);	11103	);
11104	}	11104	}
		11105	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=332843
		11106	public void test738() {
		11107	final Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		11108	DefaultCodeFormatterOptions preferences = new DefaultCodeFormatterOptions(options);
		11109	DefaultCodeFormatter codeFormatter = new DefaultCodeFormatter(preferences);
		11110	IRegion[] regions = new IRegion[] {
		11111	new Region(705, 0)
		11112	};
		11113	runTest(codeFormatter, "test738", "RecipeDocumentProvider.java", CodeFormatter.K_COMPILATION_UNIT, 0, true, regions, "\n");//$NON-NLS-1$ //$NON-NLS-2$
		11114	}
11105	}	11115	}

Added Link Here

(-)workspace/Formatter/test738/RecipeDocumentProvider_in.java (+62 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Common Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/cpl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.recipeeditor;
12
13	import org.eclipse.jface.text.IDocument;
14	import org.eclipse.jface.text.IDocumentExtension3;
15	import org.eclipse.jface.text.IDocumentPartitioner;
16	import org.eclipse.jface.text.rules.FastPartitioner;
17	import org.eclipse.jface.text.rules.IPredicateRule;
18	import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
19	import org.eclipse.jface.text.rules.SingleLineRule;
20	import org.eclipse.jface.text.rules.Token;
21	import org.eclipse.ui.editors.text.FileDocumentProvider;
22
23	public class RecipeDocumentProvider extends FileDocumentProvider {
24	/**
25	* The recipe partitioning. It contains two partition types: {@link #RECIPE_CODE} and
26	* {@link #RECIPE_COMMENT}.
27	*/
28	public static final String RECIPE_PARTITIONING= "org.recipeeditor.recipepartitioning"; //$NON-NLS-1$
29
30	/**
31	* The identifier of the comment body type.
32	*/
33	public static final String RECIPE_CODE= IDocument.DEFAULT_CONTENT_TYPE;
34	/**
35	* The identifier of the comment partition type.
36	*/
37	public static final String RECIPE_COMMENT= "RECIPE_COMMENT"; //$NON-NLS-1$
38
39	private static final String[] CONTENT_TYPES= {
40	RECIPE_CODE,
41	RECIPE_COMMENT
42	};
43
44	protected void setupDocument(Object element,IDocument document) {
45	if (document instanceof IDocumentExtension3) {
46	IDocumentExtension3 ext= (IDocumentExtension3) document;
47	IDocumentPartitioner partitioner= createRecipePartitioner();
48	ext.setDocumentPartitioner(RECIPE_PARTITIONING, partitioner);
49	partitioner.connect(document);
50	}
51	}
52
53	private IDocumentPartitioner createRecipePartitioner() {
54	IPredicateRule[] rules= { new SingleLineRule("#", null, new Token(RECIPE_COMMENT), (char) 0, true, false) }; //$NON-NLS-1$
55
56	RuleBasedPartitionScanner scanner= new RuleBasedPartitionScanner();
57	scanner.setPredicateRules(rules);
58
59	return new FastPartitioner(scanner, CONTENT_TYPES);
60	}
61
62	}