Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/services/cssCompletion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import * as l10n from '@vscode/l10n';
import { isDefined } from '../utils/objects.js';
import { CSSDataManager } from '../languageFacts/dataManager.js';
import { PathCompletionParticipant } from './pathCompletion.js';
import { Scanner, TokenType } from '../parser/cssScanner.js';
import { SCSSScanner } from '../parser/scssScanner.js';
import { LESSScanner } from '../parser/lessScanner.js';

const SnippetFormat = InsertTextFormat.Snippet;

Expand Down Expand Up @@ -115,6 +118,9 @@ export class CSSCompletion {
},
items: []
};
if (isInsideComment(document, this.offset)) {
return result;
}
this.nodePath = nodes.getNodePath(this.styleSheet, this.offset);

for (let i = this.nodePath.length - 1; i >= 0; i--) {
Expand Down Expand Up @@ -1111,6 +1117,36 @@ class Set {
}
}

function isInsideComment(document: TextDocument, offset: number): boolean {
let scanner: Scanner;
switch (document.languageId) {
case 'scss':
scanner = new SCSSScanner();
break;
case 'less':
scanner = new LESSScanner();
break;
default:
scanner = new Scanner();
}
scanner.ignoreComment = false;
const text = document.getText();
scanner.setSource(text);

let token = scanner.scan();
while (token.type !== TokenType.EOF && token.offset <= offset) {
if (token.type === TokenType.Comment || token.type === TokenType.SingleLineComment) {
const tokenEnd = token.offset + token.len;
const isSingleLineComment = text.startsWith('//', token.offset);
if (offset < tokenEnd || (isSingleLineComment && offset === tokenEnd)) {
return true;
}
}
token = scanner.scan();
}
return false;
}

function moveCursorInsideParenthesis(text: string): string {
return text.replace(/\(\)$/, "($1)");
}
Expand Down
15 changes: 15 additions & 0 deletions src/test/css/completion.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,21 @@ suite('CSS - Completion', () => {
});
});
test('selectors', async function () {
await testCompletionFor('/* comment:| */', {
count: 0
});
await testCompletionFor('/* comment */:|', {
items: [
{ label: ':hover' }
]
});
await testCompletionFor('// comment:|', {
count: 0
}, undefined, 'test://test/test.scss');
await testCompletionFor('// comment:|', {
count: 0
}, undefined, 'test://test/test.less');

await testCompletionFor('a:h| ', {
items: [
{ label: ':hover', resultText: 'a:hover ' },
Expand Down