Skip to content

Commit

Permalink
Update Prettier configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
remcohaszing committed Aug 19, 2023
1 parent 67c8b10 commit de1b756
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
proseWrap: always
semi: false
singleQuote: true
trailingComma: all
trailingComma: none
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ window.MonacoEnvironment = {
default:
throw new Error(`Unknown label ${label}`)
}
},
}
}

const monacoUnified = configureMonacoUnified(monaco, {
languageSelector: 'markdown',
label: 'remark',
configuration: {
// This configuration will be passed to your worker.
},
}
})
```
Expand Down
6 changes: 3 additions & 3 deletions examples/demo/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ window.MonacoEnvironment = {
default:
throw new Error(`Unknown label ${label}`)
}
},
}
}

const form = document.getElementById('configuration') as HTMLFormElement
Expand All @@ -34,7 +34,7 @@ function getConfiguration(): Record<string, boolean> {
const monacoUnified = configureMonacoUnified(monaco, {
label: 'remark',
languageSelector: 'markdown',
configuration: getConfiguration(),
configuration: getConfiguration()
})

for (const checkbox of form) {
Expand Down Expand Up @@ -74,7 +74,7 @@ const ed = monaco.editor.create(document.getElementById('editor')!, {
model: monaco.editor.createModel(value, 'markdown', monaco.Uri.parse('readme.md')),
theme: window.matchMedia('(prefers-color-scheme: dark)').matches ? 'vs-dark' : 'vs-light',
unicodeHighlight: { ambiguousCharacters: false },
wordWrap: 'on',
wordWrap: 'on'
})

monaco.editor.onDidChangeMarkers(([resource]) => {
Expand Down
4 changes: 2 additions & 2 deletions examples/demo/src/remark.worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ const remarkPlugins = {
'remark-lint-no-undefined-references': remarkLintNoUndefinedReferences,
'remark-lint-no-unneeded-full-reference-image': remarkLintNoUnneededFullReferenceImage,
'remark-lint-no-unneeded-full-reference-link': remarkLintNoUnneededFullReferenceLink,
'remark-lint-no-unused-definitions': remarkLintNoUnusedDefinitions,
'remark-lint-no-unused-definitions': remarkLintNoUnusedDefinitions
} as const

const retextPlugins = {
'retext-intensify': retextIntensify,
'retext-profanities': retextProfanities,
'retext-quotes': retextQuotes,
'retext-repeated-words': retextRepeatedWords,
'retext-repeated-words': retextRepeatedWords
} as const

initialize((vfile, configuration: Record<string, boolean>) => {
Expand Down
18 changes: 9 additions & 9 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createWorkerManager, type WorkerManagerOptions } from 'monaco-worker-ma
import {
createCodeActionProvider,
createDocumentFormattingProvider,
createMarkerDataProvider,
createMarkerDataProvider
} from './languageFeatures.js'
import { type UnifiedWorker } from './worker.js'

Expand Down Expand Up @@ -52,14 +52,14 @@ export interface MonacoUnified<Configuration> extends IDisposable {
*/
export function configureMonacoUnified<Configuration>(
monaco: typeof import('monaco-editor'),
options: MonacoUnifiedOptions<Configuration>,
options: MonacoUnifiedOptions<Configuration>
): MonacoUnified<Configuration> {
const workerManager = createWorkerManager<UnifiedWorker>(monaco, {
label: options.label,
moduleId: options.label,
createData: options.configuration,
interval: options.interval,
stopWhenIdleFor: options.stopWhenIdleFor,
stopWhenIdleFor: options.stopWhenIdleFor
})

let markerDataProvider: IDisposable | undefined
Expand All @@ -68,18 +68,18 @@ export function configureMonacoUnified<Configuration>(
disposables.push(
languages.registerDocumentFormattingEditProvider(
options.languageSelector,
createDocumentFormattingProvider(workerManager.getWorker),
),
createDocumentFormattingProvider(workerManager.getWorker)
)
)
}
if (options.validation !== false) {
disposables.push(
languages.registerCodeActionProvider(options.languageSelector, createCodeActionProvider()),
languages.registerCodeActionProvider(options.languageSelector, createCodeActionProvider())
)
markerDataProvider = registerMarkerDataProvider(
monaco,
options.languageSelector,
createMarkerDataProvider(monaco, workerManager.getWorker),
createMarkerDataProvider(monaco, workerManager.getWorker)
)
}

Expand All @@ -98,9 +98,9 @@ export function configureMonacoUnified<Configuration>(
markerDataProvider = registerMarkerDataProvider(
monaco,
options.languageSelector,
createMarkerDataProvider(monaco, workerManager.getWorker),
createMarkerDataProvider(monaco, workerManager.getWorker)
)
}
},
}
}
}
22 changes: 11 additions & 11 deletions languageFeatures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const messagesMap = new WeakMap<editor.ITextModel, SerializableMarkerData[]>()
*/
export function createMarkerDataProvider(
{ Uri }: typeof import('monaco-editor'),
getWorker: GetWorker,
getWorker: GetWorker
): MarkerDataProvider {
return {
owner: 'unified',
Expand All @@ -35,9 +35,9 @@ export function createMarkerDataProvider(

return messages.map(({ code, expected, url, ...message }) => ({
...message,
code: url ? { target: Uri.parse(url), value: code ?? url } : code,
code: url ? { target: Uri.parse(url), value: code ?? url } : code
}))
},
}
}
}

Expand All @@ -49,7 +49,7 @@ export function createMarkerDataProvider(
* @returns A Monaco document formatting provider.
*/
export function createDocumentFormattingProvider(
getWorker: GetWorker,
getWorker: GetWorker
): languages.DocumentFormattingEditProvider {
return {
async provideDocumentFormattingEdits(model) {
Expand All @@ -62,7 +62,7 @@ export function createDocumentFormattingProvider(
}

return [{ range: model.getFullModelRange(), text }]
},
}
}
}

Expand Down Expand Up @@ -104,10 +104,10 @@ export function createCodeActionProvider(): languages.CodeActionProvider {
{
textEdit: { range: message, text: expected },
resource: model.uri,
versionId: model.getVersionId(),
},
],
},
versionId: model.getVersionId()
}
]
}
})
}
}
Expand All @@ -117,8 +117,8 @@ export function createCodeActionProvider(): languages.CodeActionProvider {
actions,
dispose() {
// This function is needed by the TypeScript interface
},
}
}
},
}
}
}
8 changes: 4 additions & 4 deletions worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export interface UnifiedWorker {
*/
export type ProcessorGetter<Configuration> = (
file: VFile,
configuration: Configuration,
configuration: Configuration
) => Processor | PromiseLike<Processor>

/**
Expand Down Expand Up @@ -75,7 +75,7 @@ function vfileMessageToMarkerData(message: VFileMessage): SerializableMarkerData
code: message.ruleId ?? undefined,
source: message.source ?? undefined,
expected: message.expected ?? undefined,
url: message.url ?? undefined,
url: message.url ?? undefined
}
}

Expand All @@ -92,7 +92,7 @@ export function initialize<Configuration>(getProcessor: ProcessorGetter<Configur
if (String(model.uri) === uri) {
return new VFile({
path: new URL(uri),
value: model.getValue(),
value: model.getValue()
})
}
}
Expand Down Expand Up @@ -121,7 +121,7 @@ export function initialize<Configuration>(getProcessor: ProcessorGetter<Configur
const processor = await getProcessor(file, createData)
const { value } = await processor.process(file)
return value
},
}
}
})
}

0 comments on commit de1b756

Please sign in to comment.