minor refactor of @apply diagnostics

master
Brad Cornes 2020-06-11 18:07:20 +01:00
parent 1473a4d88c
commit cc587adf35
4 changed files with 68 additions and 15 deletions

View File

@ -6,37 +6,35 @@ import {
import { State } from '../util/state' import { State } from '../util/state'
import { isCssDoc } from '../util/css' import { isCssDoc } from '../util/css'
import { findClassNamesInRange } from '../util/find' import { findClassNamesInRange } from '../util/find'
import { getClassNameParts } from '../util/getClassNameAtPosition' import { getClassNameMeta } from '../util/getClassNameMeta'
const dlv = require('dlv')
function provideCssDiagnostics(state: State, document: TextDocument): void { function provideCssDiagnostics(state: State, document: TextDocument): void {
const classNames = findClassNamesInRange(document, undefined, 'css') const classNames = findClassNamesInRange(document, undefined, 'css')
let diagnostics: Diagnostic[] = classNames let diagnostics: Diagnostic[] = classNames
.map(({ className, range }) => { .map(({ className, range }) => {
const parts = getClassNameParts(state, className) const meta = getClassNameMeta(state, className)
if (!parts) return null if (!meta) return null
const info = dlv(state.classNames.classNames, parts)
let message: string let message: string
if (Array.isArray(info)) { if (Array.isArray(meta)) {
message = `\`@apply\` cannot be used with \`.${className}\` because it is included in multiple rulesets.` message = `\`@apply\` cannot be used with \`.${className}\` because it is included in multiple rulesets.`
} else if (info.__source !== 'utilities') { } else if (meta.source !== 'utilities') {
message = `\`@apply\` cannot be used with \`.${className}\` because it is not a utility.` message = `\`@apply\` cannot be used with \`.${className}\` because it is not a utility.`
} else if (info.__context && info.__context.length > 0) { } else if (meta.context && meta.context.length > 0) {
if (info.__context.length === 1) { if (meta.context.length === 1) {
message = `\`@apply\` cannot be used with \`.${className}\` because it is nested inside of an at-rule (${info.__context[0]}).` message = `\`@apply\` cannot be used with \`.${className}\` because it is nested inside of an at-rule (${meta.context[0]}).`
} else { } else {
message = `\`@apply\` cannot be used with \`.${className}\` because it is nested inside of at-rules (${info.__context.join( message = `\`@apply\` cannot be used with \`.${className}\` because it is nested inside of at-rules (${meta.context.join(
', ' ', '
)}).` )}).`
} }
} else if (info.__pseudo && info.__pseudo.length > 0) { } else if (meta.pseudo && meta.pseudo.length > 0) {
if (info.__pseudo.length === 1) { if (meta.pseudo.length === 1) {
message = `\`@apply\` cannot be used with \`.${className}\` because its definition includes a pseudo-selector (${info.__pseudo[0]})` message = `\`@apply\` cannot be used with \`.${className}\` because its definition includes a pseudo-selector (${meta.pseudo[0]})`
} else { } else {
message = `\`@apply\` cannot be used with \`.${className}\` because its definition includes pseudo-selectors (${info.__pseudo.join( message = `\`@apply\` cannot be used with \`.${className}\` because its definition includes pseudo-selectors (${meta.pseudo.join(
', ' ', '
)})` )})`
} }

View File

@ -0,0 +1,20 @@
import { State } from './state'
import { getClassNameParts } from './getClassNameAtPosition'
import removeMeta from './removeMeta'
const dlv = require('dlv')
export function getClassNameDecls(
state: State,
className: string
): Record<string, string> | Record<string, string>[] | null {
const parts = getClassNameParts(state, className)
if (!parts) return null
const info = dlv(state.classNames.classNames, parts)
if (Array.isArray(info)) {
return info.map(removeMeta)
}
return removeMeta(info)
}

View File

@ -0,0 +1,28 @@
import { State, ClassNameMeta } from './state'
import { getClassNameParts } from './getClassNameAtPosition'
const dlv = require('dlv')
export function getClassNameMeta(
state: State,
className: string
): ClassNameMeta | ClassNameMeta[] {
const parts = getClassNameParts(state, className)
if (!parts) return null
const info = dlv(state.classNames.classNames, parts)
if (Array.isArray(info)) {
return info.map((i) => ({
source: i.__source,
pseudo: i.__pseudo,
scope: i.__scope,
context: i.__context,
}))
}
return {
source: info.__source,
pseudo: info.__pseudo,
scope: info.__scope,
context: info.__context,
}
}

View File

@ -53,3 +53,10 @@ export type DocumentClassName = {
className: string className: string
range: Range range: Range
} }
export type ClassNameMeta = {
source: 'base' | 'components' | 'utilities'
pseudo: string[]
scope: string[]
context: string[]
}