1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
diff --git a/src/lsp/providers/documentColorProvider.ts b/src/lsp/providers/documentColorProvider.ts
index 5c9e9e34917301c3ba93b1cd70a8f4bf3ce6e9a9..d9ea6a6edf27b3f390ba55d5d3c0e54353e1d5d8 100644
--- a/src/lsp/providers/documentColorProvider.ts
+++ b/src/lsp/providers/documentColorProvider.ts
@@ -7,7 +7,6 @@ findHelperFunctionsInDocument,
} from '../util/find'
import { getClassNameParts } from '../util/getClassNameAtPosition'
import { getColor, getColorFromValue } from '../util/color'
-import { logFull } from '../util/logFull'
import { stringToPath } from '../util/stringToPath'
const dlv = require('dlv')
@@ -15,47 +14,43 @@ export function registerDocumentColorProvider(state: State) {
onMessage(
state.editor.connection,
'getDocumentColors',
- async ({ document, classes, cssHelpers }) => {
+ async ({ document }) => {
let colors = []
let doc = state.editor.documents.get(document)
if (!doc) return { colors }
- if (classes) {
- let classLists = findClassListsInDocument(state, doc)
- classLists.forEach((classList) => {
- let classNames = getClassNamesInClassList(classList)
- classNames.forEach((className) => {
- let parts = getClassNameParts(state, className.className)
- if (!parts) return
- let color = getColor(state, parts)
- if (!color) return
- colors.push({ range: className.range, color: color.documentation })
- })
+ let classLists = findClassListsInDocument(state, doc)
+ classLists.forEach((classList) => {
+ let classNames = getClassNamesInClassList(classList)
+ classNames.forEach((className) => {
+ let parts = getClassNameParts(state, className.className)
+ if (!parts) return
+ let color = getColor(state, parts)
+ if (!color) return
+ colors.push({ range: className.range, color: color.documentation })
})
- }
+ })
- if (cssHelpers) {
- let helperFns = findHelperFunctionsInDocument(state, doc)
- helperFns.forEach((fn) => {
- let keys = stringToPath(fn.value)
- let base = fn.helper === 'theme' ? ['theme'] : []
- let value = dlv(state.config, [...base, ...keys])
- let color = getColorFromValue(value)
- if (color) {
- // colors.push({
- // range: {
- // start: {
- // line: fn.valueRange.start.line,
- // character: fn.valueRange.start.character + 1,
- // },
- // end: fn.valueRange.end,
- // },
- // color,
- // })
- colors.push({ range: fn.valueRange, color })
- }
- })
- }
+ let helperFns = findHelperFunctionsInDocument(state, doc)
+ helperFns.forEach((fn) => {
+ let keys = stringToPath(fn.value)
+ let base = fn.helper === 'theme' ? ['theme'] : []
+ let value = dlv(state.config, [...base, ...keys])
+ let color = getColorFromValue(value)
+ if (color) {
+ // colors.push({
+ // range: {
+ // start: {
+ // line: fn.valueRange.start.line,
+ // character: fn.valueRange.start.character + 1,
+ // },
+ // end: fn.valueRange.end,
+ // },
+ // color,
+ // })
+ colors.push({ range: fn.valueRange, color })
+ }
+ })
return { colors }
}
|