Resolve merge conflicts and finalize merge

This commit is contained in:
karankulshrestha 2025-04-11 20:05:10 +05:30
parent 1081b8879f
commit 8bd7061dfc
3 changed files with 4037 additions and 4050 deletions

8084
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -10,10 +10,12 @@
// * *
// *********************************************************************
import { fileURLToPath, pathToFileURL } from 'node:url';
import { promises } from 'node:fs';
import { join } from 'node:path';
// SEE https://nodejs.org/docs/latest/api/module.html#initialize
const _specifierToUrl: Record<string, string> = {};

View file

@ -11,6 +11,7 @@ import { Handler } from '../../../../common/editorCommon.js';
import { CursorUndo, CursorUndoRedoController } from '../../browser/cursorUndo.js';
import { withTestCodeEditor } from '../../../../test/browser/testCodeEditor.js';
suite('FindController', () => {
ensureNoDisposablesAreLeakedInTestSuite();