Remove languageId constant

It’s inlined now.
remcohaszing · Sep 6, 2023 · 2151e52 · 2151e52
1 parent f060f44
commit 2151e52
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/src/constants.ts b/src/constants.ts
diff --git a/src/index.ts b/src/index.ts
@@ -4,7 +4,6 @@ import { type MonacoEditor } from 'monaco-types'
 import { createWorkerManager } from 'monaco-worker-manager'
 import { type MonacoYaml, type MonacoYamlOptions } from 'monaco-yaml'
 
-import { languageId } from './constants.js'
 import {
   createCodeActionProvider,
   createCompletionItemProvider,
@@ -34,7 +33,7 @@ export function configureMonacoYaml(monaco: MonacoEditor, options: MonacoYamlOpt
   setMonaco(monaco)
 
   monaco.languages.register({
-    id: languageId,
+    id: 'yaml',
     extensions: ['.yaml', '.yml'],
     aliases: ['YAML', 'yaml', 'YML', 'yml'],
     mimetypes: ['application/x-yaml']
@@ -48,42 +47,36 @@ export function configureMonacoYaml(monaco: MonacoEditor, options: MonacoYamlOpt
 
   let markerDataProvider = registerMarkerDataProvider(
     monaco,
-    languageId,
+    'yaml',
     createMarkerDataProvider(worker.getWorker)
   )
   const disposables = [
     worker,
 
     monaco.languages.registerCompletionItemProvider(
-      languageId,
+      'yaml',
       createCompletionItemProvider(worker.getWorker)
     ),
 
-    monaco.languages.registerHoverProvider(languageId, createHoverProvider(worker.getWorker)),
+    monaco.languages.registerHoverProvider('yaml', createHoverProvider(worker.getWorker)),
 
-    monaco.languages.registerDefinitionProvider(
-      languageId,
-      createDefinitionProvider(worker.getWorker)
-    ),
+    monaco.languages.registerDefinitionProvider('yaml', createDefinitionProvider(worker.getWorker)),
 
     monaco.languages.registerDocumentSymbolProvider(
-      languageId,
+      'yaml',
       createDocumentSymbolProvider(worker.getWorker)
     ),
 
     monaco.languages.registerDocumentFormattingEditProvider(
-      languageId,
+      'yaml',
       createDocumentFormattingEditProvider(worker.getWorker)
     ),
 
-    monaco.languages.registerLinkProvider(languageId, createLinkProvider(worker.getWorker)),
+    monaco.languages.registerLinkProvider('yaml', createLinkProvider(worker.getWorker)),
 
-    monaco.languages.registerCodeActionProvider(
-      languageId,
-      createCodeActionProvider(worker.getWorker)
-    ),
+    monaco.languages.registerCodeActionProvider('yaml', createCodeActionProvider(worker.getWorker)),
 
-    monaco.languages.setLanguageConfiguration(languageId, {
+    monaco.languages.setLanguageConfiguration('yaml', {
       comments: {
         lineComment: '#'
       },
@@ -128,7 +121,7 @@ export function configureMonacoYaml(monaco: MonacoEditor, options: MonacoYamlOpt
       markerDataProvider.dispose()
       markerDataProvider = registerMarkerDataProvider(
         monaco,
-        languageId,
+        'yaml',
         createMarkerDataProvider(worker.getWorker)
       )
     }

diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
@@ -15,14 +15,13 @@ import {
 import { type MarkerDataProvider } from 'monaco-marker-data-provider'
 import { type WorkerGetter } from 'monaco-worker-manager'
 
-import { languageId } from './constants.js'
 import { type YAMLWorker } from './yaml.worker.js'
 
 export type WorkerAccessor = WorkerGetter<YAMLWorker>
 
 export function createMarkerDataProvider(getWorker: WorkerAccessor): MarkerDataProvider {
   return {
-    owner: languageId,
+    owner: 'yaml',
     async provideMarkerData(model) {
       const worker = await getWorker(model.uri)
       const diagnostics = await worker.doValidation(String(model.uri))

diff --git a/src/yaml.worker.ts b/src/yaml.worker.ts
@@ -20,8 +20,6 @@ import {
   type WorkspaceContextService
 } from 'yaml-language-server/lib/esm/languageservice/yamlLanguageService.js'
 
-import { languageId } from './constants.js'
-
 async function schemaRequestService(uri: string): Promise<string> {
   const response = await fetch(uri)
   if (response.ok) {
@@ -79,7 +77,7 @@ initialize<YAMLWorker, MonacoYamlOptions>((ctx, { enableSchemaRequest, ...langua
     const models = ctx.getMirrorModels()
     for (const model of models) {
       if (String(model.uri) === uri) {
-        return TextDocument.create(uri, languageId, model.version, model.getValue())
+        return TextDocument.create(uri, 'yaml', model.version, model.getValue())
       }
     }
   }