Attachment #87346 for bug #174597




	 *
	 */
	public static final String EDITOR_FOLDING_ENABLED= "editor_folding_enabled"; //$NON-NLS-1$
	
	/**
	 * A named preference that stores the configured folding provider.
	 * <p>

	public static final String EDITOR_FOLDING_STRUCTURES= "editor_folding_default_structures"; //$NON-NLS-1$

	/**
	 * A named preference that stores the value for statements (if/else while/do, for, switch statements)
	 * <p>
	 * Value is of type <code>Boolean</code>.
	 * </p>
	 */
	public static final String EDITOR_FOLDING_STATEMENTS = "editor_folding_statements"; //$NON-NLS-1$
	
	/**
	 * A named preference that stores the value for functions folding for the default folding provider.
	 * <p>
	 * Value is of type <code>Boolean</code>.

Lines 20-24 Link Here

(-)src/org/eclipse/cdt/internal/ui/text/folding/FoldingMessages.properties (+1 lines)
20	DefaultCFoldingPreferenceBlock_headers= &Header Comments	20	DefaultCFoldingPreferenceBlock_headers= &Header Comments
21	DefaultCFoldingPreferenceBlock_inactive_code= &Inactive Preprocessor Branches	21	DefaultCFoldingPreferenceBlock_inactive_code= &Inactive Preprocessor Branches
22	DefaultCFoldingPreferenceBlock_preprocessor_enabled= Enable folding of preprocessor branches (#if/#endif)	22	DefaultCFoldingPreferenceBlock_preprocessor_enabled= Enable folding of preprocessor branches (#if/#endif)
		23	DefaultCFoldingPreferenceBlock_statements_enabled= Enable folding of control flow statements (if, else, do/while, for, switch)
23		24
24	EmptyCFoldingPreferenceBlock_emptyCaption=	25	EmptyCFoldingPreferenceBlock_emptyCaption=




		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_HEADERS));
		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE));
		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED));
		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_STATEMENTS));
		
		return (OverlayKey[]) overlayKeys.toArray(new OverlayKey[overlayKeys.size()]);
	}

		inner.setLayout(layout);

		addCheckBox(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_preprocessor_enabled, PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED, 1);
		addCheckBox(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_statements_enabled, PreferenceConstants.EDITOR_FOLDING_STATEMENTS, 1);
		ControlFactory.createEmptySpace(inner);

		Composite group= ControlFactory.createGroup(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_title, 1);

		addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_methods, PreferenceConstants.EDITOR_FOLDING_METHODS, 0); 
		addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_structures, PreferenceConstants.EDITOR_FOLDING_STRUCTURES, 0); 
		addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_comments, PreferenceConstants.EDITOR_FOLDING_COMMENTS, 0); 
		addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_headers, PreferenceConstants.EDITOR_FOLDING_HEADERS, 0);
		fInactiveCodeFoldingCheckBox= addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_inactive_code, PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE, 0); 
		
		return inner;

		if (PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED.equals(key)) {
			fInactiveCodeFoldingCheckBox.setEnabled(fOverlayStore.getBoolean(key));
		}
		if (PreferenceConstants.EDITOR_FOLDING_STATEMENTS.equals(key)) {
			fInactiveCodeFoldingCheckBox.setEnabled(fOverlayStore.getBoolean(key));
		}
	}

	/*




import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;

import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTExpression;
import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
import org.eclipse.cdt.core.dom.ast.IASTForStatement;
import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
import org.eclipse.cdt.core.dom.ast.IASTStatement;
import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;

import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;
import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;

	
	private int fMinCommentLines= 1;
	private boolean fPreprocessorBranchFoldingEnabled= true;
	private boolean fStatementsFoldingEnabled = false;
	private boolean fCommentFoldingEnabled= true;

	private ICReconcilingListener fReconilingListener;

		fCollapseComments= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_COMMENTS);
		fCollapseInactiveCode= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE);
		fPreprocessorBranchFoldingEnabled= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED);
		fStatementsFoldingEnabled = store.getBoolean(PreferenceConstants.EDITOR_FOLDING_STATEMENTS);
		fCommentFoldingEnabled= true;
	}


				// ignore
			}
		}
		if (fPreprocessorBranchFoldingEnabled || fStatementsFoldingEnabled) {
			IASTTranslationUnit ast= ctx.getAST();
			if (ast == null) {
				final ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider();

		return false;
	}
	
	class ModifiableRegionExtra extends ModifiableRegion {
		/* A modifiable region with extra information about the 
		 * region it holds. It tells us whether or not to include
		 * the last line of the region */
		public boolean inclusive;
	}
	
	/**
	 * Computes folding structure for preprocessor branches for the given AST.
	 * 
	 * @param ast
	 * @param ctx
	 */
	private void computeStatementFoldingStructure(IASTTranslationUnit ast, FoldingStructureComputationContext ctx) {
		final Stack<ModifiableRegionExtra> iral = new Stack<ModifiableRegionExtra>();
		ast.accept(new ASTVisitor() {
			{
				shouldVisitStatements = true;
			}

			public int visit(IASTStatement statement) {
				// if it's not part of the displayed - file, we don't need it
				if (!statement.isPartOfTranslationUnitFile())
					return PROCESS_SKIP;//we neither need its descendants
				try {
					ModifiableRegionExtra mr;
					IASTFileLocation fl;
					if (statement instanceof IASTIfStatement) {
						IASTIfStatement ifstmt = (IASTIfStatement) statement;
						IASTStatement tmp;
						mr = new ModifiableRegionExtra();
						tmp = ifstmt.getThenClause();
						if (tmp==null) return PROCESS_CONTINUE;
						fl = tmp.getFileLocation();
						mr.setLength(fl.getNodeLength());
						mr.setOffset(fl.getNodeOffset());
						mr.inclusive = false;
						tmp = ifstmt.getElseClause();
						if (tmp==null) {
							mr.inclusive = true;
							iral.push(mr);
							return PROCESS_CONTINUE;
						}
						iral.push(mr);
						mr = new ModifiableRegionExtra();
						fl = tmp.getFileLocation();
						mr.setLength(fl.getNodeLength());
						mr.setOffset(fl.getNodeOffset());
						mr.inclusive = true;
						iral.push(mr);
					}
					mr = new ModifiableRegionExtra();
					mr.inclusive = true;
					if (statement instanceof IASTDoStatement)
						mr.inclusive = false;
					//if (statement instanceof IASTSwitchStatement) {
						/* The following code should visit any case statements within the
						 * switch statement, and add folding to each case statement.
						 * For some unknown reason, it fails to even visit a single child statement
						 * of the switch statement, the visit function in the anonymous class is never
						 * visited.
						 * I leave the code commented in case anyone wish to fix it.
						statement.accept(new ASTVisitor() {
							{
								shouldVisitStatements = true;
							}
							boolean pushedMR = false;
							//did we pushed a ModifiableRegion to iral stack? If we did we might need to update it
							public int visit(IASTStatement stmt) {
								ModifiableRegionExtra tmpmr;
								if (!(stmt instanceof IASTCaseStatement)) {
									if (!pushedMR) return PROCESS_SKIP;
									tmpmr = iral.peek();
									tmpmr.setLength(tmpmr.getLength()+stmt.getFileLocation().getNodeLength());
									System.out.printf("%d is good\n", tmpmr.getLength()+stmt.getFileLocation().getNodeLength()); //$NON-NLS-1$
									if (stmt instanceof IASTBreakStatement) pushedMR = false;
									return PROCESS_SKIP;
								}
								IASTCaseStatement casestmt = (IASTCaseStatement) stmt;
								tmpmr = new ModifiableRegionExtra();
								IASTFileLocation tmpfl = casestmt.getExpression().getFileLocation();
								tmpmr.setOffset(tmpfl.getNodeOffset());
								tmpmr.setLength(tmpfl.getNodeLength());
								iral.push(tmpmr);
								pushedMR = true;
								
								return PROCESS_SKIP;
							}
						});*/
					//}
					if (statement instanceof IASTForStatement ||
							statement instanceof IASTWhileStatement ||
							statement instanceof IASTDoStatement ||
							statement instanceof IASTSwitchStatement) {
						fl = statement.getFileLocation();
						mr.setLength(fl.getNodeLength());
						mr.setOffset(fl.getNodeOffset());
						iral.push(mr);
					} 
					return PROCESS_CONTINUE;
				} catch (Throwable e) {
					CCorePlugin.log(e);
					return PROCESS_CONTINUE;
				}
			}
		});
		while (!iral.empty()) {
			ModifiableRegionExtra mr = iral.pop();
			IRegion aligned = alignRegion(mr, ctx,mr.inclusive);
			if (aligned != null) {
				Position alignedPos= new Position(aligned.getOffset(), aligned.getLength());
				ctx.addProjectionRange(new CProjectionAnnotation(false, computeKey(mr, ctx), false), alignedPos);
			}
		}
	}
	
	/**
	 * Compute folding structure of things related to the AST tree.
	 * Currently it computes the folding structure for:
	 * preprocessor branches for the given AST.
	 * Also, it computes statements folding (if/else do/while for and switch)
	 * 
	 * @param ast
	 * @param ctx

		if (fileName == null) {
			return;
		}
		
		if (fStatementsFoldingEnabled) computeStatementFoldingStructure(ast, ctx);
		
		if (fPreprocessorBranchFoldingEnabled) computePreprocessorFoldingStructure(ast, ctx, fileName);
	}

	/**
	 * Computes folding structure for preprocessor branches for the given AST.
	 * 
	 * @param ast
	 * @param ctx
	 * @param fileName
	 */
	private void computePreprocessorFoldingStructure(IASTTranslationUnit ast,
			FoldingStructureComputationContext ctx, String fileName) {
		List branches= new ArrayList();
		Stack<Branch> branchStack = new Stack<Branch>();
		


		IASTPreprocessorStatement[] preprocStmts = ast.getAllPreprocessorStatements();


Lines 30-35 Link Here

(-)src/org/eclipse/cdt/internal/ui/text/folding/FoldingMessages.java (+1 lines)
30	public static String DefaultCFoldingPreferenceBlock_inactive_code;	30	public static String DefaultCFoldingPreferenceBlock_inactive_code;
31	public static String DefaultCFoldingPreferenceBlock_preprocessor_enabled;	31	public static String DefaultCFoldingPreferenceBlock_preprocessor_enabled;
32	public static String EmptyCFoldingPreferenceBlock_emptyCaption;	32	public static String EmptyCFoldingPreferenceBlock_emptyCaption;
		33	public static String DefaultCFoldingPreferenceBlock_statements_enabled;
33		34
34	static {	35	static {
35	NLS.initializeMessages(BUNDLE_NAME, FoldingMessages.class);	36	NLS.initializeMessages(BUNDLE_NAME, FoldingMessages.class);




#Fri Jan 11 13:51:05 IST 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate

org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected

org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=80
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

Lines 1-7 Link Here

(-).settings/org.eclipse.pde.prefs (-1 / +3 lines)
1	#Tue Sep 26 11:18:15 CEST 2006	1	#Fri Jan 11 13:31:33 IST 2008
2	compilers.incompatible-environment=1	2	compilers.incompatible-environment=1
3	compilers.p.build=1	3	compilers.p.build=1
4	compilers.p.deprecated=1	4	compilers.p.deprecated=1
		5	compilers.p.missing-bundle-classpath-entries=1
		6	compilers.p.missing-packages=2
5	compilers.p.no-required-att=0	7	compilers.p.no-required-att=0
6	compilers.p.not-externalized-att=1	8	compilers.p.not-externalized-att=1
7	compilers.p.unknown-attribute=1	9	compilers.p.unknown-attribute=1

Lines 1-4 Link Here

(-).settings/org.eclipse.jdt.ui.prefs (-1 / +2 lines)
1	#Wed Nov 28 11:20:40 CET 2007	1	#Fri Jan 11 13:51:05 IST 2008
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	formatter_profile=_Eclipse [built-in] - cdt	3	formatter_profile=_Eclipse [built-in] - cdt
4	formatter_settings_version=11	4	formatter_settings_version=11
Lines 6-8 Link Here
6	org.eclipse.jdt.ui.importorder=java;javax;org;com;org.eclipse.cdt;org.eclipse.cdt.internal;org.eclipse.cdt.internal.ui;	6	org.eclipse.jdt.ui.importorder=java;javax;org;com;org.eclipse.cdt;org.eclipse.cdt.internal;org.eclipse.cdt.internal.ui;
7	org.eclipse.jdt.ui.ondemandthreshold=99	7	org.eclipse.jdt.ui.ondemandthreshold=99
8	org.eclipse.jdt.ui.staticondemandthreshold=99	8	org.eclipse.jdt.ui.staticondemandthreshold=99
		9	org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>

Return to bug 174597

Lines 792-798 Link Here

(-)src/org/eclipse/cdt/ui/PreferenceConstants.java (-1 / +9 lines)
792	*	792	*
793	*/	793	*/
794	public static final String EDITOR_FOLDING_ENABLED= "editor_folding_enabled"; //$NON-NLS-1$	794	public static final String EDITOR_FOLDING_ENABLED= "editor_folding_enabled"; //$NON-NLS-1$
795		795
796	/**	796	/**
797	* A named preference that stores the configured folding provider.	797	* A named preference that stores the configured folding provider.
798	* <p>	798	* <p>
Lines 813-818 Link Here
813	public static final String EDITOR_FOLDING_STRUCTURES= "editor_folding_default_structures"; //$NON-NLS-1$	813	public static final String EDITOR_FOLDING_STRUCTURES= "editor_folding_default_structures"; //$NON-NLS-1$
814		814
815	/**	815	/**
		816	* A named preference that stores the value for statements (if/else while/do, for, switch statements)
		817	* <p>
		818	* Value is of type <code>Boolean</code>.
		819	* </p>
		820	*/
		821	public static final String EDITOR_FOLDING_STATEMENTS = "editor_folding_statements"; //$NON-NLS-1$
		822
		823	/**
816	* A named preference that stores the value for functions folding for the default folding provider.	824	* A named preference that stores the value for functions folding for the default folding provider.
817	* <p>	825	* <p>
818	* Value is of type <code>Boolean</code>.	826	* Value is of type <code>Boolean</code>.

Lines 74-79 Link Here

(-)src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingPreferenceBlock.java (-1 / +6 lines)
74	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_HEADERS));	74	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_HEADERS));
75	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE));	75	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE));
76	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED));	76	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED));
		77	overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_FOLDING_STATEMENTS));
77		78
78	return (OverlayKey[]) overlayKeys.toArray(new OverlayKey[overlayKeys.size()]);	79	return (OverlayKey[]) overlayKeys.toArray(new OverlayKey[overlayKeys.size()]);
79	}	80	}
Lines 92-97 Link Here
92	inner.setLayout(layout);	93	inner.setLayout(layout);
93		94
94	addCheckBox(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_preprocessor_enabled, PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED, 1);	95	addCheckBox(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_preprocessor_enabled, PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED, 1);
		96	addCheckBox(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_statements_enabled, PreferenceConstants.EDITOR_FOLDING_STATEMENTS, 1);
95	ControlFactory.createEmptySpace(inner);	97	ControlFactory.createEmptySpace(inner);
96		98
97	Composite group= ControlFactory.createGroup(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_title, 1);	99	Composite group= ControlFactory.createGroup(inner, FoldingMessages.DefaultCFoldingPreferenceBlock_title, 1);
Lines 101-107 Link Here
101	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_methods, PreferenceConstants.EDITOR_FOLDING_METHODS, 0);	103	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_methods, PreferenceConstants.EDITOR_FOLDING_METHODS, 0);
102	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_structures, PreferenceConstants.EDITOR_FOLDING_STRUCTURES, 0);	104	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_structures, PreferenceConstants.EDITOR_FOLDING_STRUCTURES, 0);
103	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_comments, PreferenceConstants.EDITOR_FOLDING_COMMENTS, 0);	105	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_comments, PreferenceConstants.EDITOR_FOLDING_COMMENTS, 0);
104	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_headers, PreferenceConstants.EDITOR_FOLDING_HEADERS, 0);	106	addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_headers, PreferenceConstants.EDITOR_FOLDING_HEADERS, 0);
105	fInactiveCodeFoldingCheckBox= addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_inactive_code, PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE, 0);	107	fInactiveCodeFoldingCheckBox= addCheckBox(group, FoldingMessages.DefaultCFoldingPreferenceBlock_inactive_code, PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE, 0);
106		108
107	return inner;	109	return inner;
Lines 137-142 Link Here
137	if (PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED.equals(key)) {	139	if (PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED.equals(key)) {
138	fInactiveCodeFoldingCheckBox.setEnabled(fOverlayStore.getBoolean(key));	140	fInactiveCodeFoldingCheckBox.setEnabled(fOverlayStore.getBoolean(key));
139	}	141	}
		142	if (PreferenceConstants.EDITOR_FOLDING_STATEMENTS.equals(key)) {
		143	fInactiveCodeFoldingCheckBox.setEnabled(fOverlayStore.getBoolean(key));
		144	}
140	}	145	}
141		146
142	/*	147	/*

Lines 50-55 Link Here

(-)src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java (-3 / +156 lines)
50	import org.eclipse.ui.texteditor.IDocumentProvider;	50	import org.eclipse.ui.texteditor.IDocumentProvider;
51	import org.eclipse.ui.texteditor.ITextEditor;	51	import org.eclipse.ui.texteditor.ITextEditor;
52		52
		53	import org.eclipse.cdt.core.CCorePlugin;
		54	import org.eclipse.cdt.core.dom.ast.ASTVisitor;
		55	import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
		56	import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
		57	import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
		58	import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
		59	import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
		60	import org.eclipse.cdt.core.dom.ast.IASTExpression;
		61	import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
		62	import org.eclipse.cdt.core.dom.ast.IASTForStatement;
		63	import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
		64	import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
		65	import org.eclipse.cdt.core.dom.ast.IASTStatement;
		66	import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
		67
53	import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;	68	import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
54	import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;	69	import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;
55	import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;	70	import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;
Lines 647-652 Link Here
647		662
648	private int fMinCommentLines= 1;	663	private int fMinCommentLines= 1;
649	private boolean fPreprocessorBranchFoldingEnabled= true;	664	private boolean fPreprocessorBranchFoldingEnabled= true;
		665	private boolean fStatementsFoldingEnabled = false;
650	private boolean fCommentFoldingEnabled= true;	666	private boolean fCommentFoldingEnabled= true;
651		667
652	private ICReconcilingListener fReconilingListener;	668	private ICReconcilingListener fReconilingListener;
Lines 810-815 Link Here
810	fCollapseComments= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_COMMENTS);	826	fCollapseComments= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_COMMENTS);
811	fCollapseInactiveCode= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE);	827	fCollapseInactiveCode= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE);
812	fPreprocessorBranchFoldingEnabled= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED);	828	fPreprocessorBranchFoldingEnabled= store.getBoolean(PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED);
		829	fStatementsFoldingEnabled = store.getBoolean(PreferenceConstants.EDITOR_FOLDING_STATEMENTS);
813	fCommentFoldingEnabled= true;	830	fCommentFoldingEnabled= true;
814	}	831	}
815		832
Lines 1041-1047 Link Here
1041	// ignore	1058	// ignore
1042	}	1059	}
1043	}	1060	}
1044	if (fPreprocessorBranchFoldingEnabled) {	1061	if (fPreprocessorBranchFoldingEnabled \|\| fStatementsFoldingEnabled) {
1045	IASTTranslationUnit ast= ctx.getAST();	1062	IASTTranslationUnit ast= ctx.getAST();
1046	if (ast == null) {	1063	if (ast == null) {
1047	final ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider();	1064	final ASTProvider astProvider= CUIPlugin.getDefault().getASTProvider();
Lines 1081-1088 Link Here
1081	return false;	1098	return false;
1082	}	1099	}
1083		1100
		1101	class ModifiableRegionExtra extends ModifiableRegion {
		1102	/* A modifiable region with extra information about the
		1103	* region it holds. It tells us whether or not to include
		1104	* the last line of the region */
		1105	public boolean inclusive;
		1106	}
		1107
1084	/**	1108	/**
1085	* Compute folding structure of the preprocessor branches for the given AST.	1109	* Computes folding structure for preprocessor branches for the given AST.
		1110	*
		1111	* @param ast
		1112	* @param ctx
		1113	*/
		1114	private void computeStatementFoldingStructure(IASTTranslationUnit ast, FoldingStructureComputationContext ctx) {
		1115	final Stack<ModifiableRegionExtra> iral = new Stack<ModifiableRegionExtra>();
		1116	ast.accept(new ASTVisitor() {
		1117	{
		1118	shouldVisitStatements = true;
		1119	}
		1120
		1121	public int visit(IASTStatement statement) {
		1122	// if it's not part of the displayed - file, we don't need it
		1123	if (!statement.isPartOfTranslationUnitFile())
		1124	return PROCESS_SKIP;//we neither need its descendants
		1125	try {
		1126	ModifiableRegionExtra mr;
		1127	IASTFileLocation fl;
		1128	if (statement instanceof IASTIfStatement) {
		1129	IASTIfStatement ifstmt = (IASTIfStatement) statement;
		1130	IASTStatement tmp;
		1131	mr = new ModifiableRegionExtra();
		1132	tmp = ifstmt.getThenClause();
		1133	if (tmp==null) return PROCESS_CONTINUE;
		1134	fl = tmp.getFileLocation();
		1135	mr.setLength(fl.getNodeLength());
		1136	mr.setOffset(fl.getNodeOffset());
		1137	mr.inclusive = false;
		1138	tmp = ifstmt.getElseClause();
		1139	if (tmp==null) {
		1140	mr.inclusive = true;
		1141	iral.push(mr);
		1142	return PROCESS_CONTINUE;
		1143	}
		1144	iral.push(mr);
		1145	mr = new ModifiableRegionExtra();
		1146	fl = tmp.getFileLocation();
		1147	mr.setLength(fl.getNodeLength());
		1148	mr.setOffset(fl.getNodeOffset());
		1149	mr.inclusive = true;
		1150	iral.push(mr);
		1151	}
		1152	mr = new ModifiableRegionExtra();
		1153	mr.inclusive = true;
		1154	if (statement instanceof IASTDoStatement)
		1155	mr.inclusive = false;
		1156	//if (statement instanceof IASTSwitchStatement) {
		1157	/* The following code should visit any case statements within the
		1158	* switch statement, and add folding to each case statement.
		1159	* For some unknown reason, it fails to even visit a single child statement
		1160	* of the switch statement, the visit function in the anonymous class is never
		1161	* visited.
		1162	* I leave the code commented in case anyone wish to fix it.
		1163	statement.accept(new ASTVisitor() {
		1164	{
		1165	shouldVisitStatements = true;
		1166	}
		1167	boolean pushedMR = false;
		1168	//did we pushed a ModifiableRegion to iral stack? If we did we might need to update it
		1169	public int visit(IASTStatement stmt) {
		1170	ModifiableRegionExtra tmpmr;
		1171	if (!(stmt instanceof IASTCaseStatement)) {
		1172	if (!pushedMR) return PROCESS_SKIP;
		1173	tmpmr = iral.peek();
1174	tmpmr.setLength(tmpmr.getLength()+stmt.getFileLocation().getNodeLength());
1175	System.out.printf("%d is good\n", tmpmr.getLength()+stmt.getFileLocation().getNodeLength()); //$NON-NLS-1$
1176	if (stmt instanceof IASTBreakStatement) pushedMR = false;
1177	return PROCESS_SKIP;
1178	}
1179	IASTCaseStatement casestmt = (IASTCaseStatement) stmt;
1180	tmpmr = new ModifiableRegionExtra();
1181	IASTFileLocation tmpfl = casestmt.getExpression().getFileLocation();
1182	tmpmr.setOffset(tmpfl.getNodeOffset());
1183	tmpmr.setLength(tmpfl.getNodeLength());
1184	iral.push(tmpmr);
1185	pushedMR = true;
1186
1187	return PROCESS_SKIP;
1188	}
1189	});*/
1190	//}
1191	if (statement instanceof IASTForStatement \|\|
1192	statement instanceof IASTWhileStatement \|\|
1193	statement instanceof IASTDoStatement \|\|
1194	statement instanceof IASTSwitchStatement) {
1195	fl = statement.getFileLocation();
1196	mr.setLength(fl.getNodeLength());
1197	mr.setOffset(fl.getNodeOffset());
1198	iral.push(mr);
1199	}
1200	return PROCESS_CONTINUE;
1201	} catch (Throwable e) {
1202	CCorePlugin.log(e);
1203	return PROCESS_CONTINUE;
1204	}
1205	}
1206	});
1207	while (!iral.empty()) {
1208	ModifiableRegionExtra mr = iral.pop();
1209	IRegion aligned = alignRegion(mr, ctx,mr.inclusive);
1210	if (aligned != null) {
1211	Position alignedPos= new Position(aligned.getOffset(), aligned.getLength());
1212	ctx.addProjectionRange(new CProjectionAnnotation(false, computeKey(mr, ctx), false), alignedPos);
1213	}
1214	}
1215	}
1216
1217	/**
1218	* Compute folding structure of things related to the AST tree.
1219	* Currently it computes the folding structure for:
1220	* preprocessor branches for the given AST.
1221	* Also, it computes statements folding (if/else do/while for and switch)
1086	*	1222	*
1087	* @param ast	1223	* @param ast
1088	* @param ctx	1224	* @param ctx
Lines 1095-1102 Link Here
1095	if (fileName == null) {	1231	if (fileName == null) {
1096	return;	1232	return;
1097	}	1233	}
		1234
		1235	if (fStatementsFoldingEnabled) computeStatementFoldingStructure(ast, ctx);
		1236
		1237	if (fPreprocessorBranchFoldingEnabled) computePreprocessorFoldingStructure(ast, ctx, fileName);
		1238	}
		1239
		1240	/**
		1241	* Computes folding structure for preprocessor branches for the given AST.
		1242	*
		1243	* @param ast
		1244	* @param ctx
		1245	* @param fileName
		1246	*/
		1247	private void computePreprocessorFoldingStructure(IASTTranslationUnit ast,
		1248	FoldingStructureComputationContext ctx, String fileName) {
1098	List branches= new ArrayList();	1249	List branches= new ArrayList();
1099	Stack branchStack = new Stack();	1250	Stack<Branch> branchStack = new Stack<Branch>();
		1251
		1252
1100		1253
1101	IASTPreprocessorStatement[] preprocStmts = ast.getAllPreprocessorStatements();	1254	IASTPreprocessorStatement[] preprocStmts = ast.getAllPreprocessorStatements();
1102		1255

Lines 1-9 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-6 / +10 lines)
1	#Wed Nov 28 11:20:40 CET 2007	1	#Fri Jan 11 13:51:05 IST 2008
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
5	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve	5	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6	org.eclipse.jdt.core.compiler.compliance=1.4	6	org.eclipse.jdt.core.compiler.compliance=1.6
7	org.eclipse.jdt.core.compiler.debug.lineNumber=generate	7	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8	org.eclipse.jdt.core.compiler.debug.localVariable=generate	8	org.eclipse.jdt.core.compiler.debug.localVariable=generate
9	org.eclipse.jdt.core.compiler.debug.sourceFile=generate	9	org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Lines 16-22 Link Here
16	org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled	16	org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
17	org.eclipse.jdt.core.compiler.problem.discouragedReference=error	17	org.eclipse.jdt.core.compiler.problem.discouragedReference=error
18	org.eclipse.jdt.core.compiler.problem.emptyStatement=warning	18	org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
19	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	19	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
20	org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore	20	org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
21	org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled	21	org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
22	org.eclipse.jdt.core.compiler.problem.fieldHiding=warning	22	org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
Lines 38-43 Link Here
38	org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore	38	org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
39	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled	39	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
40	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public	40	org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
		41	org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
41	org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore	42	org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
42	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled	43	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
43	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected	44	org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
Lines 77-83 Link Here
77	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning	78	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
78	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning	79	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
79	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning	80	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
80	org.eclipse.jdt.core.compiler.source=1.4	81	org.eclipse.jdt.core.compiler.source=1.6
81	org.eclipse.jdt.core.formatter.align_type_members_on_columns=false	82	org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
82	org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16	83	org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
83	org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16	84	org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Lines 325-333 Link Here
325	org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false	326	org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
326	org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false	327	org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
327	org.eclipse.jdt.core.formatter.lineSplit=80	328	org.eclipse.jdt.core.formatter.lineSplit=80
		329	org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
		330	org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
328	org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0	331	org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
329	org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1	332	org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
330	org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true	333	org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
331	org.eclipse.jdt.core.formatter.tabulation.char=tab	334	org.eclipse.jdt.core.formatter.tabulation.char=tab
332	org.eclipse.jdt.core.formatter.tabulation.size=4	335	org.eclipse.jdt.core.formatter.tabulation.size=4
333	org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false	336	org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
		337	org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true