From b8316e99dc301c8b082b18e22fc052814848c4f0 Mon Sep 17 00:00:00 2001
From: David Thompson <davthomp@redhat.com>
Date: Thu, 30 Apr 2026 12:04:22 -0400
Subject: [PATCH] Revert "Adjust to switch of formatter implementation from
 prettier to yaml"

This reverts commit 6dc890635a639de552a937d3b11902d69b8f8bb6.
---
 .vscodeignore               |  3 +++
 smoke-test/smoke.test.ts    | 29 -----------------------------
 smoke-test/unformatted.yaml |  2 --
 webpack.config.js           |  2 ++
 4 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 smoke-test/unformatted.yaml

diff --git a/.vscodeignore b/.vscodeignore
index 9e55a3c8..b030a4e1 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -21,3 +21,6 @@ CONTRIBUTING.md
 **/**.vsix
 **/**.tar.gz
 test-resources
+!node_modules/prettier/index.js
+!node_modules/prettier/third-party.js
+!node_modules/prettier/parser-yaml.js
diff --git a/smoke-test/smoke.test.ts b/smoke-test/smoke.test.ts
index dc455d10..d20aaf6c 100644
--- a/smoke-test/smoke.test.ts
+++ b/smoke-test/smoke.test.ts
@@ -10,11 +10,9 @@ describe('Smoke test suite', function () {
 
   const SCHEMA_INSTANCE_NAME = 'references-schema.yaml';
   const THROUGH_SETTINGS_NAME = 'references-schema-settings.yaml';
-  const UNFORMATTED_NAME = 'unformatted.yaml';
 
   let schemaInstanceUri: URI;
   let throughSettingsUri: URI;
-  let unformattedUri: URI;
 
   before(async function () {
     if (vscode.workspace.workspaceFolders === undefined) {
@@ -27,9 +25,6 @@ describe('Smoke test suite', function () {
     throughSettingsUri = workspaceUri.with({
       path: workspaceUri.path + (workspaceUri.path.endsWith('/') ? '' : '/') + THROUGH_SETTINGS_NAME,
     });
-    unformattedUri = workspaceUri.with({
-      path: workspaceUri.path + (workspaceUri.path.endsWith('/') ? '' : '/') + UNFORMATTED_NAME,
-    });
   });
 
   it('has right diagnostics when schema is referenced through a comment', async function () {
@@ -51,28 +46,4 @@ describe('Smoke test suite', function () {
     assert.strictEqual(diagnostics.length, 1);
     assert.strictEqual(diagnostics[0].message, 'Value is below the minimum of 0.');
   });
-
-  it('has right formatting', async function () {
-    const textDocument = await vscode.workspace.openTextDocument(unformattedUri);
-    await vscode.window.showTextDocument(textDocument);
-
-    // heavily borrowed from prettier's test suite
-    const edits = await vscode.commands.executeCommand<vscode.TextEdit[]>(
-      'vscode.executeFormatDocumentProvider',
-      textDocument.uri,
-      { tabSize: 2, insertSpaces: true }
-    );
-
-    if (edits && edits.length > 0) {
-      const workspaceEdit = new vscode.WorkspaceEdit();
-      workspaceEdit.set(textDocument.uri, edits);
-      await vscode.workspace.applyEdit(workspaceEdit);
-    }
-
-    const EXPECTED = `aaa:
-  bbb: hjkl
-`;
-
-    assert.strictEqual(textDocument.getText(), EXPECTED);
-  });
 });
diff --git a/smoke-test/unformatted.yaml b/smoke-test/unformatted.yaml
deleted file mode 100644
index 2630ac88..00000000
--- a/smoke-test/unformatted.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-aaa:
-    bbb:  hjkl
diff --git a/webpack.config.js b/webpack.config.js
index 45b36661..1326b0d4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -31,6 +31,7 @@ const config = {
   devtool: 'source-map',
   externals: {
     vscode: 'commonjs vscode', // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
+    prettier: 'commonjs prettier',
   },
   resolve: {
     // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
@@ -135,6 +136,7 @@ const serverWeb = {
     mainFields: ['browser', 'module', 'main'],
     extensions: ['.ts', '.js'], // support ts-files and js-files
     alias: {
+      './services/yamlFormatter': path.resolve(__dirname, './build/polyfills/yamlFormatter.js'), // not supported for now. prettier can run in the web, but it's a bit more work.
       'vscode-json-languageservice/lib/umd': 'vscode-json-languageservice/lib/esm',
     },
     fallback: {