Fix tests

The localization tests need to initialize the language server with the
correct translation loading function.

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

src/nodeTranslationSetup.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) IBM Corp. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as path from 'path';
+import { existsSync } from 'fs';
+import { URI } from 'vscode-uri';
+import * as l10n from '@vscode/l10n';
+import { InitializeParams } from 'vscode-languageserver';
+
+/**
+ * Loads translations from the filesystem based on the configured locale and the folder of translations provided in hte initilaization parameters.
+ *
+ * This is the default implementation when running as binary, but isn't used when running as a web worker.
+ *
+ * @param params the language server initialization parameters
+ */
+export async function setupl10nBundle(params: InitializeParams): Promise<void> {
+  const __dirname = path.dirname(__filename);
+  const l10nPath: string = params.initializationOptions?.l10nPath || path.join(__dirname, '../../../l10n');
+  const locale: string = params.locale || 'en';
+  if (l10nPath) {
+    const bundleFile = !existsSync(path.join(l10nPath, `bundle.l10n.${locale}.json`))
+      ? `bundle.l10n.json`
+      : `bundle.l10n.${locale}.json`;
+    const baseBundleFile = path.join(l10nPath, bundleFile);
+    process.env.VSCODE_NLS_CONFIG = JSON.stringify({
+      locale,
+      _languagePackSupport: true,
+    });
+    await l10n.config({
+      uri: URI.file(baseBundleFile).toString(),
+    });
+  }
+}

src/server.ts

@@ -5,16 +5,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { promises as fs, existsSync } from 'fs';
-import { Connection, createConnection, InitializeParams, ProposedFeatures } from 'vscode-languageserver/node';
+import { promises as fs } from 'fs';
+import { Connection, createConnection, ProposedFeatures } from 'vscode-languageserver/node';
 import { TelemetryImpl } from './languageserver/telemetry';
 import { schemaRequestHandler, workspaceContext } from './languageservice/services/schemaRequestHandler';
 import { convertErrorToTelemetryMsg } from './languageservice/utils/objects';
+import { setupl10nBundle } from './nodeTranslationSetup';
 import { YAMLServerInit } from './yamlServerInit';
 import { SettingsState } from './yamlSettings';
-import * as path from 'path';
-import * as l10n from '@vscode/l10n';
-import { URI } from 'vscode-uri';
 
 // Create a connection for the server.
 let connection: Connection = null;
@@ -69,23 +67,4 @@ const schemaRequestHandlerWrapper = (connection: Connection, uri: string): Promi
 const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
 const telemetry = new TelemetryImpl(connection);
 
-async function setupl10nBundle(params: InitializeParams): Promise<void> {
-  const __dirname = path.dirname(__filename);
-  const l10nPath: string = params.initializationOptions?.l10nPath || path.join(__dirname, '../../../l10n');
-  const locale: string = params.locale || 'en';
-  if (l10nPath) {
-    const bundleFile = !existsSync(path.join(l10nPath, `bundle.l10n.${locale}.json`))
-      ? `bundle.l10n.json`
-      : `bundle.l10n.${locale}.json`;
-    const baseBundleFile = path.join(l10nPath, bundleFile);
-    process.env.VSCODE_NLS_CONFIG = JSON.stringify({
-      locale,
-      _languagePackSupport: true,
-    });
-    await l10n.config({
-      uri: URI.file(baseBundleFile).toString(),
-    });
-  }
-}
-
 new YAMLServerInit(connection, yamlSettings, workspaceContext, schemaRequestService, telemetry, setupl10nBundle).start();

test/bundlel10n.test.ts

@@ -2,15 +2,16 @@
  *  Copyright (c) Red Hat. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import * as l10n from '@vscode/l10n';
 import * as assert from 'assert';
+import * as path from 'path';
+import { Connection, createConnection } from 'vscode-languageserver/node';
+import { schemaRequestHandler, workspaceContext } from '../src/languageservice/services/schemaRequestHandler';
+import { setupl10nBundle } from '../src/nodeTranslationSetup';
+import { YAMLServerInit } from '../src/yamlServerInit';
 import { SettingsState } from '../src/yamlSettings';
 import { TestCustomSchemaProvider, testFileSystem } from './utils/testHelper';
-import { createConnection, Connection } from 'vscode-languageserver/node';
-import { schemaRequestHandler, workspaceContext } from '../src/languageservice/services/schemaRequestHandler';
 import { TestTelemetry } from './utils/testsTypes';
-import { YAMLServerInit } from '../src/yamlServerInit';
-import * as l10n from '@vscode/l10n';
-import * as path from 'path';
 
 describe('Bundle l10n Test', () => {
   let serverInit: YAMLServerInit;
@@ -36,7 +37,7 @@ describe('Bundle l10n Test', () => {
     };
     const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
     const telemetry = new TestTelemetry(connection);
-    serverInit = new YAMLServerInit(connection, yamlSettings, workspaceContext, schemaRequestService, telemetry);
+    serverInit = new YAMLServerInit(connection, yamlSettings, workspaceContext, schemaRequestService, telemetry, setupl10nBundle);
   });
 
   after(async () => {