From 7fe434b6d81136a50793859c62a7ab9654d9f5d1 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Wed, 12 Mar 2008 12:02:58 +0000 Subject: [PATCH] Follow-up fix for 216533 --- .../folding/DefaultCFoldingStructureProvider.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java index 46365d56872..928ffb62997 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java @@ -200,10 +200,10 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi } } } - if (statement instanceof IASTForStatement || - statement instanceof IASTWhileStatement || - statement instanceof IASTDoStatement || - statement instanceof IASTSwitchStatement) { + if (statement instanceof IASTForStatement + || statement instanceof IASTWhileStatement + || statement instanceof IASTDoStatement + || statement instanceof IASTSwitchStatement) { fl = statement.getFileLocation(); mr.setLength(fl.getNodeLength()); mr.setOffset(fl.getNodeOffset()); @@ -228,13 +228,16 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi final IASTFunctionDeclarator declarator = ((IASTFunctionDefinition)declaration).getDeclarator(); if (declarator != null) { fFunction= new String(declarator.getName().toCharArray()); + fLevel= 0; } } return PROCESS_CONTINUE; } public int leave(IASTDeclaration declaration) { - fFunction= ""; //$NON-NLS-1$ + if (declaration instanceof IASTFunctionDefinition) { + fFunction= ""; //$NON-NLS-1$ + } return PROCESS_CONTINUE; }