make "invalid @apply" quick fix work in mixed-language documents

master
Brad Cornes 2020-06-18 19:58:54 +01:00
parent a6a8f7e536
commit 6add64c19b
1 changed files with 89 additions and 63 deletions

View File

@ -6,7 +6,6 @@ import {
TextEdit, TextEdit,
} from 'vscode-languageserver' } from 'vscode-languageserver'
import { State } from '../../util/state' import { State } from '../../util/state'
import { findLast } from '../../util/find'
import { isWithinRange } from '../../util/isWithinRange' import { isWithinRange } from '../../util/isWithinRange'
import { getClassNameParts } from '../../util/getClassNameAtPosition' import { getClassNameParts } from '../../util/getClassNameAtPosition'
const dlv = require('dlv') const dlv = require('dlv')
@ -31,6 +30,9 @@ import {
} from '../diagnostics/types' } from '../diagnostics/types'
import { flatten, dedupeBy } from '../../../util/array' import { flatten, dedupeBy } from '../../../util/array'
import { joinWithAnd } from '../../util/joinWithAnd' import { joinWithAnd } from '../../util/joinWithAnd'
import { getLanguageBoundaries } from '../../util/getLanguageBoundaries'
import { isCssDoc } from '../../util/css'
import { absoluteRange } from '../../util/absoluteRange'
async function getDiagnosticsFromCodeActionParams( async function getDiagnosticsFromCodeActionParams(
state: State, state: State,
@ -210,6 +212,8 @@ async function provideInvalidApplyCodeActions(
): Promise<CodeAction[]> { ): Promise<CodeAction[]> {
let document = state.editor.documents.get(params.textDocument.uri) let document = state.editor.documents.get(params.textDocument.uri)
let documentText = document.getText() let documentText = document.getText()
let cssRange: Range
let cssText = documentText
const { postcss } = state.modules const { postcss } = state.modules
let change: TextEdit let change: TextEdit
@ -217,6 +221,17 @@ async function provideInvalidApplyCodeActions(
/\s+/ /\s+/
).length ).length
if (!isCssDoc(state, document)) {
let languageBoundaries = getLanguageBoundaries(state, document)
if (!languageBoundaries) return []
cssRange = languageBoundaries.css.find((range) =>
isWithinRange(diagnostic.range.start, range)
)
if (!cssRange) return []
cssText = document.getText(cssRange)
}
try {
await postcss([ await postcss([
postcss.plugin('', (_options = {}) => { postcss.plugin('', (_options = {}) => {
return (root) => { return (root) => {
@ -225,7 +240,7 @@ async function provideInvalidApplyCodeActions(
rule.walkAtRules('apply', (atRule) => { rule.walkAtRules('apply', (atRule) => {
let { start, end } = atRule.source let { start, end } = atRule.source
let range: Range = { let atRuleRange: Range = {
start: { start: {
line: start.line - 1, line: start.line - 1,
character: start.column - 1, character: start.column - 1,
@ -235,13 +250,16 @@ async function provideInvalidApplyCodeActions(
character: end.column - 1, character: end.column - 1,
}, },
} }
if (cssRange) {
atRuleRange = absoluteRange(atRuleRange, cssRange)
}
if (!isWithinRange(diagnostic.range.start, range)) { if (!isWithinRange(diagnostic.range.start, atRuleRange)) {
// keep looking // keep looking
return true return true
} }
let className = document.getText(diagnostic.range) let className = diagnostic.className.className
let ast = classNameToAst( let ast = classNameToAst(
state, state,
className, className,
@ -263,8 +281,7 @@ async function provideInvalidApplyCodeActions(
let outputIndent: string let outputIndent: string
let documentIndent = detectIndent(documentText) let documentIndent = detectIndent(documentText)
change = { let ruleRange: Range = {
range: {
start: { start: {
line: rule.source.start.line - 1, line: rule.source.start.line - 1,
character: rule.source.start.column - 1, character: rule.source.start.column - 1,
@ -273,7 +290,13 @@ async function provideInvalidApplyCodeActions(
line: rule.source.end.line - 1, line: rule.source.end.line - 1,
character: rule.source.end.column, character: rule.source.end.column,
}, },
}, }
if (cssRange) {
ruleRange = absoluteRange(ruleRange, cssRange)
}
change = {
range: ruleRange,
newText: newText:
rule.toString() + rule.toString() +
(insertedRule.raws.before || '\n\n') + (insertedRule.raws.before || '\n\n') +
@ -296,7 +319,10 @@ async function provideInvalidApplyCodeActions(
}) })
} }
}), }),
]).process(documentText, { from: undefined }) ]).process(cssText, { from: undefined })
} catch (_) {
return []
}
if (!change) { if (!change) {
return [] return []