Two extra colons added when completing a pseudo-selector. Fixes micro…

…soft/vscode#104111
microsoft · Nov 5, 2020 · 9a01c75 · 9a01c75
1 parent bd4f3e0
commit 9a01c75
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/parser/cssParser.ts b/src/parser/cssParser.ts
@@ -1365,13 +1365,11 @@ export class Parser {
 			return null;
 		}
 		// optional, support ::
-		if (this.accept(TokenType.Colon) && this.hasWhitespace()) {
-			this.markError(node, ParseError.IdentifierExpected);
-		}
-		if (!node.addChild(this._parseIdent())) {
-			this.markError(node, ParseError.IdentifierExpected);
+		this.accept(TokenType.Colon);
+		if (this.hasWhitespace() || !node.addChild(this._parseIdent())) {
+			return this.finish(node, ParseError.IdentifierExpected);
 		}
-		return node;
+		return this.finish(node);
 	}
 
 	public _tryParsePrio(): nodes.Node | null {

diff --git a/src/test/css/completion.test.ts b/src/test/css/completion.test.ts
@@ -230,6 +230,17 @@ suite('CSS - Completion', () => {
 				{ label: '::after', resultText: 'a::after ' }
 			]
 		});
+		await testCompletionFor('a::| foo { }', { // #104111
+			items: [
+				{ label: ':hover', resultText: 'a:hover ' },
+				{ label: '::after', resultText: 'a::after foo { }' }
+			]
+		});
+		await testCompletionFor('a:| foo { }', { // #104111
+			items: [
+				{ label: '::after', resultText: 'a::after foo { }' }
+			]
+		});
 		await testCompletionFor('a#| ', {
 			items: [
 				{ label: ':hover', resultText: 'a:hover ' },

diff --git a/src/test/css/parser.test.ts b/src/test/css/parser.test.ts
@@ -387,6 +387,8 @@ suite('CSS - Parser', () => {
 		assertNode(':global(.output ::selection)', parser, parser._parsePseudo.bind(parser)); // #49010
 		assertNode(':matches(:hover, :focus)', parser, parser._parsePseudo.bind(parser)); // #49010
 		assertNode(':host([foo=bar][bar=foo])', parser, parser._parsePseudo.bind(parser)); // #49589
+		assertError('::', parser, parser._parsePseudo.bind(parser), ParseError.IdentifierExpected);
+		assertError(':: foo', parser, parser._parsePseudo.bind(parser), ParseError.IdentifierExpected);
 	});
 
 	test('declaration', function () {