Revert "Fix language-specific tab expansion and polish (microsoft#157035)" (microsoft#160234)

rzhao271 · web-flow · commit 43ef57989eb8 · 2022-09-14T08:09:01.000-07:00
This reverts commit 9f80085.
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
@@ -65,7 +65,7 @@
         "emmet.showAbbreviationSuggestions": {
           "type": "boolean",
           "default": true,
-          "scope": "resource",
+          "scope": "language-overridable",
           "markdownDescription": "%emmetShowAbbreviationSuggestions%"
         },
         "emmet.includeLanguages": {
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
@@ -264,47 +264,47 @@ export async function wrapWithAbbreviation(args: any): Promise<boolean> {
 }
 
 export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined> {
-	if (!validate()) {
-		return Promise.resolve(undefined);
+	if (!validate() || !vscode.window.activeTextEditor) {
+		return fallbackTab();
 	}
 
-	const editor = vscode.window.activeTextEditor!;
-
-	args = args || {};
-	if (!args['language']) {
-		args['language'] = editor.document.languageId;
-	} else {
-		const excludedLanguages = vscode.workspace.getConfiguration('emmet')['excludeLanguages'] ?? [];
-		if (excludedLanguages.includes(args['language'])) {
-			return fallbackTab(args['language']);
-		}
-	}
-	const languageId: string = args['language'];
-
 	/**
 	 * Short circuit the parsing. If previous character is space, do not expand.
 	 */
-	if (editor.selections.length === 1 && editor.selection.isEmpty
+	if (vscode.window.activeTextEditor.selections.length === 1 &&
+		vscode.window.activeTextEditor.selection.isEmpty
 	) {
-		const anchor = editor.selection.anchor;
+		const anchor = vscode.window.activeTextEditor.selection.anchor;
 		if (anchor.character === 0) {
-			return fallbackTab(languageId);
+			return fallbackTab();
 		}
 
 		const prevPositionAnchor = anchor.translate(0, -1);
-		const prevText = editor.document.getText(new vscode.Range(prevPositionAnchor, anchor));
+		const prevText = vscode.window.activeTextEditor.document.getText(new vscode.Range(prevPositionAnchor, anchor));
 		if (prevText === ' ' || prevText === '\t') {
-			return fallbackTab(languageId);
+			return fallbackTab();
 		}
 	}
 
+	args = args || {};
+	if (!args['language']) {
+		args['language'] = vscode.window.activeTextEditor.document.languageId;
+	} else {
+		const excludedLanguages = vscode.workspace.getConfiguration('emmet')['excludeLanguages'] ? vscode.workspace.getConfiguration('emmet')['excludeLanguages'] : [];
+		if (excludedLanguages.indexOf(vscode.window.activeTextEditor.document.languageId) > -1) {
+			return fallbackTab();
+		}
+	}
 	const syntax = getSyntaxFromArgs(args);
 	if (!syntax) {
-		return fallbackTab(languageId);
+		return fallbackTab();
 	}
+
+	const editor = vscode.window.activeTextEditor;
+
 	// When tabbed on a non empty selection, do not treat it as an emmet abbreviation, and fallback to tab instead
-	if (vscode.workspace.getConfiguration('emmet', { languageId })['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {
-		return fallbackTab(languageId);
+	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true && editor.selections.find(x => !x.isEmpty)) {
+		return fallbackTab();
 	}
 
 	const abbreviationList: ExpandAbbreviationInput[] = [];
@@ -325,7 +325,7 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 		}
 
 		const currentLine = editor.document.lineAt(position.line).text;
-		const textTillPosition = currentLine.substring(0, position.character);
+		const textTillPosition = currentLine.substr(0, position.character);
 
 		// Expand cases like <div to <div></div> explicitly
 		// else we will end up with <<div></div>
@@ -415,12 +415,12 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined
 	});
 
 	return expandAbbreviationInRange(editor, abbreviationList, allAbbreviationsSame).then(success => {
-		return success ? Promise.resolve(undefined) : fallbackTab(languageId);
+		return success ? Promise.resolve(undefined) : fallbackTab();
 	});
 }
 
-function fallbackTab(languageId: string): Thenable<boolean | undefined> {
-	if (vscode.workspace.getConfiguration('emmet', { languageId })['triggerExpansionOnTab'] === true) {
+function fallbackTab(): Thenable<boolean | undefined> {
+	if (vscode.workspace.getConfiguration('emmet')['triggerExpansionOnTab'] === true) {
 		return vscode.commands.executeCommand('tab');
 	}
 	return Promise.resolve(true);
@@ -470,13 +470,13 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 				&& propertyNode.separator
 				&& offset >= propertyNode.separatorToken.end
 				&& offset <= propertyNode.terminatorToken.start
-				&& !abbreviation.includes(':')) {
+				&& abbreviation.indexOf(':') === -1) {
 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
 			}
 			if (!propertyNode.terminatorToken
 				&& propertyNode.separator
 				&& offset >= propertyNode.separatorToken.end
-				&& !abbreviation.includes(':')) {
+				&& abbreviation.indexOf(':') === -1) {
 				return hexColorRegex.test(abbreviation) || abbreviation === '!';
 			}
 			if (hexColorRegex.test(abbreviation) || abbreviation === '!') {
@@ -529,7 +529,7 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen
 			const typeAttribute = (currentHtmlNode.attributes || []).filter(x => x.name.toString() === 'type')[0];
 			const typeValue = typeAttribute ? typeAttribute.value.toString() : '';
 
-			if (allowedMimeTypesInScriptTag.includes(typeValue)) {
+			if (allowedMimeTypesInScriptTag.indexOf(typeValue) > -1) {
 				return true;
 			}
 
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -31,7 +31,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 
 			if (expandedText.startsWith('<')) {
 				this.lastCompletionType = 'html';
-			} else if (expandedText.includes(':') && expandedText.endsWith(';')) {
+			} else if (expandedText.indexOf(':') > 0 && expandedText.endsWith(';')) {
 				this.lastCompletionType = 'css';
 			} else {
 				this.lastCompletionType = undefined;
@@ -43,7 +43,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 	private provideCompletionItemsInternal(document: vscode.TextDocument, position: vscode.Position, context: vscode.CompletionContext): Thenable<vscode.CompletionList | undefined> | undefined {
 		const emmetConfig = vscode.workspace.getConfiguration('emmet');
 		const excludedLanguages = emmetConfig['excludeLanguages'] ? emmetConfig['excludeLanguages'] : [];
-		if (excludedLanguages.includes(document.languageId)) {
+		if (excludedLanguages.indexOf(document.languageId) > -1) {
 			return;
 		}
 
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
@@ -140,7 +140,7 @@ function getNextAttribute(document: vscode.TextDocument, selectionStart: number,
 		}
 
 		// Fetch the next word in the attr value
-		if (!attr.value.toString().includes(' ')) {
+		if (attr.value.toString().indexOf(' ') === -1) {
 			// attr value does not have space, so no next word to find
 			continue;
 		}
diff --git a/src/vs/workbench/contrib/emmet/browser/emmetActions.ts b/src/vs/workbench/contrib/emmet/browser/emmetActions.ts
@@ -8,7 +8,6 @@ import { grammarsExtPoint, ITMSyntaxExtensionPoint } from 'vs/workbench/services
 import { IExtensionService, ExtensionPointContribution } from 'vs/workbench/services/extensions/common/extensions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 interface ModeScopeMap {
 	[key: string]: string;
@@ -71,18 +70,13 @@ export abstract class EmmetEditorAction extends EditorAction {
 	}
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
-		const commandService = accessor.get(ICommandService);
-		const configurationService = accessor.get(IConfigurationService);
 		const extensionService = accessor.get(IExtensionService);
+		const commandService = accessor.get(ICommandService);
 
 		return this._withGrammarContributions(extensionService).then((grammarContributions) => {
 
 			if (this.id === 'editor.emmet.action.expandAbbreviation' && grammarContributions) {
-				const languageInfo = EmmetEditorAction.getLanguage(editor, grammarContributions);
-				const languageId = languageInfo?.language;
-				if (configurationService.getValue('emmet.triggerExpansionOnTab', { overrideIdentifier: languageId }) === true) {
-					return commandService.executeCommand<void>('emmet.expandAbbreviation', languageInfo);
-				}
+				return commandService.executeCommand<void>('emmet.expandAbbreviation', EmmetEditorAction.getLanguage(editor, grammarContributions));
 			}
 
 			return undefined;

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ function getNextAttribute(document: vscode.TextDocument, selectionStart: number,`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// Fetch the next word in the attr value`
`143`		`- if (!attr.value.toString().includes(' ')) {`
	`143`	`+ if (attr.value.toString().indexOf(' ') === -1) {`
`144`	`144`	`// attr value does not have space, so no next word to find`
`145`	`145`	`continue;`
`146`	`146`	`}`