From 860969dad7dda2ecc91ced0461c41af38aa6b7f1 Mon Sep 17 00:00:00 2001 From: David Matejka Date: Sun, 12 Jul 2015 15:42:56 +0200 Subject: [PATCH] NetteObjectFieldsTypeProvider: used finally block for removing visited field --- .../typeProvider/NetteObjectFieldsTypeProvider.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cz/juzna/intellij/nette/typeProvider/NetteObjectFieldsTypeProvider.java b/src/cz/juzna/intellij/nette/typeProvider/NetteObjectFieldsTypeProvider.java index 2a30384..7650cc5 100644 --- a/src/cz/juzna/intellij/nette/typeProvider/NetteObjectFieldsTypeProvider.java +++ b/src/cz/juzna/intellij/nette/typeProvider/NetteObjectFieldsTypeProvider.java @@ -11,11 +11,9 @@ import cz.juzna.intellij.nette.utils.MagicFieldsUtil; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; -import java.util.regex.Pattern; public class NetteObjectFieldsTypeProvider implements PhpTypeProvider2 { @@ -45,8 +43,12 @@ public String getType(PsiElement e) { return null; } visited.add(field); - Collection getters = MagicFieldsUtil.findGetters(field); - visited.remove(field); + Collection getters; + try { + getters = MagicFieldsUtil.findGetters(field); + } finally { + visited.remove(field); + } if (getters.isEmpty()) { return null; }