From 52a6ba69a18d92ebae65e2680d22c516efa7a8d0 Mon Sep 17 00:00:00 2001 From: ChrisBubernak Date: Thu, 8 Jan 2015 13:42:01 -0800 Subject: [PATCH] changed logic based on CR feedback to not get fully qualified for typeparemeters even if typeformatflag is present --- src/compiler/checker.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e79aa6e8fb4..239d9138ea2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1095,11 +1095,11 @@ module ts { } } - // Get qualified name if there is an enclosing declaration and it is not a - // type parameter or we have a flag telling us to - var needFullyQualifiedName = (enclosingDeclaration && !(symbol.flags & SymbolFlags.TypeParameter)); - var useFullyQualifiedFlag = TypeFormatFlags.UseFullyQualifiedType & typeFlags; - if (needFullyQualifiedName || useFullyQualifiedFlag) { + // Get qualified name if the symbol is not a type parameter + // and we have an enclosing declaration or a typeformat flag + var typeParameter = (symbol.flags & SymbolFlags.TypeParameter); + var typeFormatFlag = TypeFormatFlags.UseFullyQualifiedType & typeFlags; + if (!typeParameter && (enclosingDeclaration || typeFormatFlag)) { walkSymbol(symbol, meaning); return; }