fixed files form Closure #17

Spirals-Team · Mar 7, 2017 · d19c9f5 · d19c9f5
1 parent e9b0a0c
commit d19c9f5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/projects/Closure/17/com/google/javascript/jscomp/TypedScopeCreator.java b/projects/Closure/17/com/google/javascript/jscomp/TypedScopeCreator.java
@@ -1288,8 +1288,12 @@ private JSType getDeclaredType(String sourceName, JSDocInfo info,
           if (info.isConstant()) {
             JSType knownType = null;
             if (rValue != null) {
-              if (rValue.getJSType() != null && !rValue.getJSType().isUnknownType()) {
+              JSDocInfo rValueInfo = rValue.getJSDocInfo();
+              if (rValueInfo != null && rValueInfo.hasType()) {
                 // If rValue has a type-cast, we use the type in the type-cast.
+                return rValueInfo.getType().evaluate(scope, typeRegistry);
+              } else if (rValue.getJSType() != null
+                  && !rValue.getJSType().isUnknownType()) {
                 // If rValue's type was already computed during scope creation,
                 // then we can safely use that.
                 return rValue.getJSType();