discoverTypings should look at typingSafelist.json values

minestarks · minestarks · commit ddb9774de75e · 2017-06-05T15:52:19.000-07:00
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
@@ -192,7 +192,7 @@ namespace ts.JsTyping {
             const cleanedTypingNames = map(inferredTypingNames, f => f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""));
 
             if (safeList !== EmptySafeList) {
-                mergeTypings(filter(cleanedTypingNames, f => safeList.has(f)));
+                mergeTypings(map(filter(cleanedTypingNames, f => safeList.has(f)), (f => safeList.get(f))));
             }
 
             const hasJsxFile = forEach(fileNames, f => ensureScriptKind(f, getScriptKindFromFileName(f)) === ScriptKind.JSX);

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ namespace ts.JsTyping {`
`192`	`192`	`const cleanedTypingNames = map(inferredTypingNames, f => f.replace(/((?:\.\|-)min(?=\.\|$))\|((?:-\|\.)\d+)/g, ""));`
`193`	`193`
`194`	`194`	`if (safeList !== EmptySafeList) {`
`195`		`- mergeTypings(filter(cleanedTypingNames, f => safeList.has(f)));`
	`195`	`+ mergeTypings(map(filter(cleanedTypingNames, f => safeList.has(f)), (f => safeList.get(f))));`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`const hasJsxFile = forEach(fileNames, f => ensureScriptKind(f, getScriptKindFromFileName(f)) === ScriptKind.JSX);`