From f1c7c19a361f37e9350a60d9b5dd907ee6012de9 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 1 Oct 2018 16:07:55 -0700
Subject: [PATCH] Fixing some strict mode typing issues in emmet

---
 extensions/emmet/src/abbreviationActions.ts   |  4 +--
 .../src/test/cssAbbreviationAction.test.ts    | 28 +++++++++----------
 extensions/emmet/src/typings/EmmetNode.d.ts   |  6 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index bd2fdd5d1cc..ca19b490b77 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -216,7 +216,7 @@ function doWrapping(individualLines: boolean, args: any) {
 		}
 		return '';
 	}
-	const abbreviationPromise = (args && args['abbreviation']) ? Promise.resolve(args['abbreviation']) : vscode.window.showInputBox({ prompt: 'Enter Abbreviation', validateInput: inputChanged });
+	const abbreviationPromise: Thenable<string | undefined> = (args && args['abbreviation']) ? Promise.resolve(args['abbreviation']) : vscode.window.showInputBox({ prompt: 'Enter Abbreviation', validateInput: inputChanged });
 	return abbreviationPromise.then(inputAbbreviation => {
 		return makeChanges(inputAbbreviation, true);
 	});
@@ -637,7 +637,7 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
 
 }
 
-function getSyntaxFromArgs(args: Object): string | undefined {
+function getSyntaxFromArgs(args: { [x: string]: string }): string | undefined {
 	const mappedModes = getMappingForIncludedLanguages();
 	const language: string = args['language'];
 	const parentMode: string = args['parentMode'];
diff --git a/extensions/emmet/src/test/cssAbbreviationAction.test.ts b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
index 88e993cff9c..014e66d046a 100644
--- a/extensions/emmet/src/test/cssAbbreviationAction.test.ts
+++ b/extensions/emmet/src/test/cssAbbreviationAction.test.ts
@@ -406,7 +406,7 @@ nav#
 				return Promise.resolve();
 			}
 
-			const callBack = (completionList: CompletionList, abbreviation, expandedText) => {
+			const callBack = (completionList: CompletionList, abbreviation: string, expandedText: string) => {
 				if (!completionList.items || !completionList.items.length) {
 					assert.equal(1, 2, `Problem with expanding m10`);
 					return;
@@ -473,7 +473,7 @@ m10
 			editor.selection = new Selection(5, 15, 5, 15); // in the value part of property value
 			completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
 			if (completionPromise) {
-				return completionPromise.then((completionList: CompletionList) => {
+				return completionPromise.then((completionList: CompletionList | undefined) => {
 					if (completionList && completionList.items && completionList.items.length > 0) {
 						assert.equal(1, 2, `m10 gets expanded in invalid location (n the value part of property value)`);
 					}
@@ -486,18 +486,18 @@ m10
 
 });
 
-	test('Skip when typing property values when there is a nested rule in the next line (SCSS)', () => {
-		return withRandomFileEditor(scssContents, 'scss', (editor, doc) => {
-			editor.selection = new Selection(19, 10, 19, 10);
-			return expandEmmetAbbreviation(null).then(() => {
-				assert.equal(editor.document.getText(), scssContents);
-				const cancelSrc = new CancellationTokenSource();
-				const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(19, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
-				if (completionPromise) {
-					assert.equal(1, 2, `Invalid completion at property value`);
-				}
-				return Promise.resolve();
-			});
+test('Skip when typing property values when there is a nested rule in the next line (SCSS)', () => {
+	return withRandomFileEditor(scssContents, 'scss', (editor, doc) => {
+		editor.selection = new Selection(19, 10, 19, 10);
+		return expandEmmetAbbreviation(null).then(() => {
+			assert.equal(editor.document.getText(), scssContents);
+			const cancelSrc = new CancellationTokenSource();
+			const completionPromise = completionProvider.provideCompletionItems(editor.document, new Position(19, 10), cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
+			if (completionPromise) {
+				assert.equal(1, 2, `Invalid completion at property value`);
+			}
+			return Promise.resolve();
 		});
+	});
 });
 
diff --git a/extensions/emmet/src/typings/EmmetNode.d.ts b/extensions/emmet/src/typings/EmmetNode.d.ts
index 478241f0d8a..82bbf31fa50 100644
--- a/extensions/emmet/src/typings/EmmetNode.d.ts
+++ b/extensions/emmet/src/typings/EmmetNode.d.ts
@@ -26,7 +26,7 @@ declare module 'EmmetNode' {
 
     export interface CssToken extends Token {
         size: number
-        item(number): any
+        item(number: number): any
         type: string
     }
 
@@ -85,8 +85,8 @@ declare module 'EmmetNode' {
         backUp(n: number): number
         current(): string
         substring(from: Position, to: Position): string
-        eat(match): boolean
-        eatWhile(match): boolean
+        eat(match: any): boolean
+        eatWhile(match: any): boolean
     }
 }
 
-- 
GitLab