some of microsoft#76442

jrieken · jrieken · commit ab5b94db3475 · 2019-07-02T15:33:43.000+02:00
diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts
@@ -14,11 +14,11 @@ export function deepClone<T>(obj: T): T {
 		return obj as any;
 	}
 	const result: any = Array.isArray(obj) ? [] : {};
-	Object.keys(obj as any).forEach((key: string) => {
-		if (obj[key] && typeof obj[key] === 'object') {
-			result[key] = deepClone(obj[key]);
+	Object.keys(<any>obj).forEach((key: string) => {
+		if ((<any>obj)[key] && typeof (<any>obj)[key] === 'object') {
+			result[key] = deepClone((<any>obj)[key]);
 		} else {
-			result[key] = obj[key];
+			result[key] = (<any>obj)[key];
 		}
 	});
 	return result;
diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts
@@ -14,7 +14,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
 
-export const KnownSnippetVariableNames = Object.freeze({
+export const KnownSnippetVariableNames: { [key: string]: true } = Object.freeze({
 	'CURRENT_YEAR': true,
 	'CURRENT_YEAR_SHORT': true,
 	'CURRENT_MONTH': true,
@@ -275,4 +275,4 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {
 		}
 		return filename;
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService`
`14`	`14`	`import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';`
`15`	`15`	`import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';`
`16`	`16`
`17`		`-export const KnownSnippetVariableNames = Object.freeze({`
	`17`	`+export const KnownSnippetVariableNames: { [key: string]: true } = Object.freeze({`
`18`	`18`	`'CURRENT_YEAR': true,`
`19`	`19`	`'CURRENT_YEAR_SHORT': true,`
`20`	`20`	`'CURRENT_MONTH': true,`
`@@ -275,4 +275,4 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {`
`275`	`275`	`}`
`276`	`276`	`return filename;`
`277`	`277`	`}`
`278`		`-}`
	`278`	`+}`