Skip to content

Commit 09bfb69

Browse files
octrefoctref
committed
Revert "Fix microsoft#70731"
This reverts commit c25e395.
1 parent 5caff73 commit 09bfb69

5 files changed

Lines changed: 32 additions & 87 deletions

File tree

‎extensions/emmet/.vscode/launch.json‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
11
{
2-
// Use IntelliSense to learn about possible Node.js debug attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"type": "extensionHost",
9-
"request": "launch",
10-
"name": "Launch Extension",
11-
"runtimeExecutable": "${execPath}",
12-
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
13-
"sourceMaps": true,
14-
"outFiles": ["${workspaceFolder}/out/**/*.js"]
15-
},
16-
{
17-
"type": "extensionHost",
18-
"request": "launch",
19-
"name": "Launch Tests",
20-
"runtimeExecutable": "${execPath}",
21-
"args": [
22-
"--extensionDevelopmentPath=${workspaceFolder}",
23-
"--extensionTestsPath=${workspaceFolder}/out/test",
24-
"--disable-extensions",
25-
"--skip-getting-started",
26-
],
27-
"sourceMaps": true,
28-
"outFiles": ["${workspaceFolder}/out/**/*.js"]
29-
}
30-
]
31-
}
2+
// Use IntelliSense to learn about possible Node.js debug attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "extensionHost",
9+
"request": "launch",
10+
"name": "Launch Extension",
11+
"runtimeExecutable": "${execPath}",
12+
"args": [
13+
"--extensionDevelopmentPath=${workspaceFolder}"
14+
],
15+
"sourceMaps": true,
16+
"outFiles": [
17+
"${workspaceFolder}/out/**/*.js"
18+
]
19+
}
20+
]
21+
}

‎extensions/emmet/package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"displayName": "Emmet",
44
"description": "%description%",
55
"version": "1.0.0",
6-
"publisher": "vscode",
7-
"license": "MIT",
6+
"publisher": "vscode",
7+
"license": "MIT",
88
"engines": {
99
"vscode": "^1.13.0"
1010
},
@@ -450,7 +450,6 @@
450450
"@emmetio/html-matcher": "^0.3.3",
451451
"@emmetio/math-expression": "^0.1.1",
452452
"image-size": "^0.5.2",
453-
"vscode-emmet-helper": "^1.2.15",
454-
"vscode-html-languageservice": "^3.0.3"
453+
"vscode-emmet-helper": "^1.2.15"
455454
}
456455
}

‎extensions/emmet/src/defaultCompletionProvider.ts‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
import * as vscode from 'vscode';
77
import { Node, Stylesheet } from 'EmmetNode';
88
import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
9-
import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument, getNode } from './util';
10-
import { getLanguageService, TextDocument, TokenType } from 'vscode-html-languageservice';
9+
import { getEmmetHelper, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument, getEmbeddedCssNodeIfAny, isStyleAttribute, getNode } from './util';
1110

1211
export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
1312

1413
private lastCompletionType: string | undefined;
1514

16-
private htmlLS = getLanguageService();
17-
1815
public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, _: vscode.CancellationToken, context: vscode.CompletionContext): Thenable<vscode.CompletionList | undefined> | undefined {
1916
const completionResult = this.provideCompletionItemsInternal(document, position, context);
2017
if (!completionResult) {
@@ -79,37 +76,20 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
7976

8077
}
8178
if (validateLocation) {
82-
const lsDoc = TextDocument.create(document.uri.toString(), 'html', 0, document.getText());
83-
const parsedLsDoc = this.htmlLS.parseHTMLDocument(lsDoc);
84-
const positionOffset = document.offsetAt(position);
85-
const node = parsedLsDoc.findNodeAt(positionOffset);
86-
87-
if (node.tag === 'script') {
88-
return;
89-
}
90-
if (node.tag === 'style') {
79+
rootNode = parseDocument(document, false);
80+
currentNode = getNode(rootNode, position, true);
81+
if (isStyleAttribute(currentNode, position)) {
9182
syntax = 'css';
9283
validateLocation = false;
9384
} else {
94-
if (node.attributes && node.attributes['style']) {
95-
const scanner = this.htmlLS.createScanner(document.getText(), node.start);
96-
let tokenType = scanner.scan();
97-
let prevAttr = undefined;
98-
while (tokenType !== TokenType.EOS && (scanner.getTokenEnd() <= positionOffset)) {
99-
tokenType = scanner.scan();
100-
if (tokenType === TokenType.AttributeName) {
101-
prevAttr = scanner.getTokenText();
102-
}
103-
}
104-
if (prevAttr === 'style') {
105-
syntax = 'css';
106-
validateLocation = false;
107-
}
85+
const embeddedCssNode = getEmbeddedCssNodeIfAny(document, currentNode, position);
86+
if (embeddedCssNode) {
87+
currentNode = getNode(embeddedCssNode, position, true);
88+
syntax = 'css';
10889
}
10990
}
11091
}
11192

112-
11393
}
11494

11595
const extractAbbreviationResults = helper.extractAbbreviation(document, position, !isStyleSheet(syntax));

‎extensions/emmet/src/test/abbreviationAction.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ suite('Tests for Expand Abbreviations (HTML)', () => {
269269
editor.selection = new Selection(13, 14, 13, 14);
270270
const cancelSrc = new CancellationTokenSource();
271271
const completionPromise = completionProvider.provideCompletionItems(editor.document, editor.selection.active, cancelSrc.token, { triggerKind: CompletionTriggerKind.Invoke });
272-
assert.equal(!completionPromise, true, `Got unexpected completion promise instead of undefined`);
272+
assert.equal(!completionPromise, true, `Got unexpected comapletion promise instead of undefined`);
273273
return Promise.resolve();
274274
});
275275
});

‎extensions/emmet/yarn.lock‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2478,35 +2478,11 @@ vscode-emmet-helper@^1.2.15:
24782478
jsonc-parser "^1.0.0"
24792479
vscode-languageserver-types "^3.6.0-next.1"
24802480

2481-
vscode-html-languageservice@^3.0.3:
2482-
version "3.0.3"
2483-
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.0.3.tgz#0aeae18a59000e317447ea34965f72680a2140ef"
2484-
integrity sha512-U+upM3gHp3HaF3wXAnUduA6IDKcz6frWS/dTAju3cZVIyZwOLBBFElQVlLH0ycHyMzqUFrjvdv+kEyPAEWfQ/g==
2485-
dependencies:
2486-
vscode-languageserver-types "^3.15.0-next.2"
2487-
vscode-nls "^4.1.1"
2488-
vscode-uri "^2.0.3"
2489-
2490-
vscode-languageserver-types@^3.15.0-next.2:
2491-
version "3.15.0-next.2"
2492-
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.2.tgz#a0601332cdaafac21931f497bb080cfb8d73f254"
2493-
integrity sha512-2JkrMWWUi2rlVLSo9OFR2PIGUzdiowEM8NgNYiwLKnXTjpwpjjIrJbNNxDik7Rv4oo9KtikcFQZKXbrKilL/MQ==
2494-
24952481
vscode-languageserver-types@^3.6.0-next.1:
24962482
version "3.6.0-next.1"
24972483
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
24982484
integrity sha512-n4G+hCgZwAhtcJSCkwJP153TLdcEBWwrIrb3Su/SpOkhmU7KjDgxaQBLA45hf+QbhB8uKQb+TVStPvbuYFHSMA==
24992485

2500-
vscode-nls@^4.1.1:
2501-
version "4.1.1"
2502-
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
2503-
integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
2504-
2505-
vscode-uri@^2.0.3:
2506-
version "2.0.3"
2507-
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543"
2508-
integrity sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==
2509-
25102486
vscode@1.0.1:
25112487
version "1.0.1"
25122488
resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.0.1.tgz#3d161200615fe2af1d92ddc650751159411a513b"

0 commit comments

Comments
 (0)