Copies sources from vscode (#688)

* Copy sources from vscode

* NodeJS.Timeout -> TimeoutHandle

* Fixes copy sources fallout

* Fixes snapshots

Author: hediet

script/setup/copySources.ts

@@ -101,9 +101,6 @@ async function doIt(filepaths: string[]) {
 			newSource = newSource.slice(0, edit.pos + 1) + edit.newText + newSource.slice(edit.end + 1);
 		}
 
-		if (filepath.endsWith('src/vs/nls.ts')) {
-			newSource = 'declare var document: any;\n\n' + newSource;
-		}
 		newSource = '//!!! DO NOT modify, this file was COPIED from \'microsoft/vscode\'\n\n' + newSource;
 
 		seen.set(filepath, {
@@ -163,6 +160,13 @@ async function doIt(filepaths: string[]) {
 			'vs/base/node/ports.ts',
 
 			'vs/platform/instantiation/common/instantiationService.ts',
+			'vs/editor/common/core/edits/lineEdit.ts',
+			'vs/editor/common/core/edits/lengthEdit.ts',
+			'vs/editor/common/core/edits/arrayEdit.ts',
+			'vs/editor/common/core/text/positionToOffset.ts',
+
+			'vs/base/common/sseParser.ts',
+			'vs/base/common/errorMessage.ts',
 
 			// SPECIAL IMPLICIT DEPENDENCIES
 			'typings/vscode-globals-nls.d.ts',

src/extension/contextKeys/vscode-node/contextKeys.contribution.ts

@@ -40,7 +40,7 @@ const debugContextKey = 'github.copilot.chat.debug';
 export class ContextKeysContribution extends Disposable {
 
 	private _needsOfflineCheck = false;
-	private _scheduledOfflineCheck: NodeJS.Timeout | undefined;
+	private _scheduledOfflineCheck: TimeoutHandle | undefined;
 	private _showLogView = false;
 
 	constructor(

src/extension/inlineEdits/common/common.ts

@@ -4,8 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDisposable, toDisposable } from '../../../util/vs/base/common/lifecycle';
+import { ensureDependenciesAreSet } from '../../../util/vs/editor/common/core/text/positionToOffset';
 
 export function createTimeout(ms: number, cb: () => void): IDisposable {
 	const t = setTimeout(cb, ms);
 	return toDisposable(() => clearTimeout(t));
 }
+
+ensureDependenciesAreSet();

src/extension/inlineEdits/node/nextEditProviderTelemetry.ts

@@ -553,7 +553,7 @@ export class NextEditProviderTelemetryBuilder extends Disposable {
 
 export class TelemetrySender implements IDisposable {
 
-	private readonly _map = new Map<INextEditResult, { builder: NextEditProviderTelemetryBuilder; timeout: NodeJS.Timeout }>();
+	private readonly _map = new Map<INextEditResult, { builder: NextEditProviderTelemetryBuilder; timeout: TimeoutHandle }>();
 
 	constructor(
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,

src/extension/inlineEdits/node/serverPoweredInlineEditProvider.ts

@@ -93,7 +93,7 @@ export class ServerPoweredInlineEditProvider implements IStatelessNextEditProvid
 			const edits = response.edits.map(e => LineReplacement.deserialize(e));
 			const sortingPermutation = Permutation.createSortPermutation(edits, (a, b) => a.lineRange.startLineNumber - b.lineRange.startLineNumber);
 			const lineEdit = new LineEdit(sortingPermutation.apply(edits));
-			lineEdit.edits.forEach(edit => pushEdit(Result.ok({ edit })));
+			lineEdit.replacements.forEach(edit => pushEdit(Result.ok({ edit })));
 			pushEdit(Result.error(new NoNextEditReason.NoSuggestions(request.documentBeforeEdits, undefined)));
 			return StatelessNextEditResult.streaming(telemetryBuilder);
 		} else {

src/extension/inlineEdits/test/common/editRebase.spec.ts

@@ -55,14 +55,20 @@ class Point3D {
 			expect(res).toBeTypeOf('object');
 			const result = res as Exclude<typeof res, string | undefined>;
 			expect(result[0].rebasedEditIndex).toBe(1);
-			expect(result[0].rebasedEdit.toString()).toMatchInlineSnapshot(`"[68, 76) -> "\\n\\t\\tthis.z = z;""`);
+			expect(result[0].rebasedEdit.toString()).toMatchInlineSnapshot(`
+				"[68, 76) -> "
+						this.z = z;""
+			`);
 		}
 		{
 			const res = tryRebase(originalDocument, undefined, decomposeStringEdit(suggestedEdit).edits, [], userEdit, currentDocument, [], 'lenient', tracer);
 			expect(res).toBeTypeOf('object');
 			const result = res as Exclude<typeof res, string | undefined>;
 			expect(result[0].rebasedEditIndex).toBe(1);
-			expect(result[0].rebasedEdit.toString()).toMatchInlineSnapshot(`"[68, 76) -> "\\n\\t\\tthis.z = z;""`);
+			expect(result[0].rebasedEdit.toString()).toMatchInlineSnapshot(`
+				"[68, 76) -> "
+						this.z = z;""
+			`);
 		}
 	});
 
@@ -221,15 +227,25 @@ int main()
 			const result = res as Exclude<typeof res, string | undefined>;
 			expect(result[0].rebasedEditIndex).toBe(0);
 			expect(StringEdit.single(result[0].rebasedEdit).apply(currentDocument)).toStrictEqual(final);
-			expect(result[0].rebasedEdit.removeCommonSuffixAndPrefix(currentDocument).toString()).toMatchInlineSnapshot(`"[87, 164) -> "esult42.empty())\\n        return result42.size();\\n    result42.clear();\\n    return result42""`);
+			expect(result[0].rebasedEdit.removeCommonSuffixAndPrefix(currentDocument).toString()).toMatchInlineSnapshot(`
+				"[87, 164) -> "esult42.empty())
+				        return result42.size();
+				    result42.clear();
+				    return result42""
+			`);
 		}
 		{
 			const res = tryRebase(originalDocument, undefined, suggestedEdit.replacements, [], userEdit, currentDocument, [], 'lenient', tracer);
 			expect(res).toBeTypeOf('object');
 			const result = res as Exclude<typeof res, string | undefined>;
 			expect(result[0].rebasedEditIndex).toBe(0);
 			expect(StringEdit.single(result[0].rebasedEdit).apply(currentDocument)).toStrictEqual(final);
-			expect(result[0].rebasedEdit.removeCommonSuffixAndPrefix(currentDocument).toString()).toMatchInlineSnapshot(`"[87, 164) -> "esult42.empty())\\n        return result42.size();\\n    result42.clear();\\n    return result42""`);
+			expect(result[0].rebasedEdit.removeCommonSuffixAndPrefix(currentDocument).toString()).toMatchInlineSnapshot(`
+				"[87, 164) -> "esult42.empty())
+				        return result42.size();
+				    result42.clear();
+				    return result42""
+			`);
 		}
 	});
 });
@@ -330,10 +346,16 @@ class Point3D {
 
 		const strict = tryRebaseStringEdits(text, edit, base, 'strict')?.removeCommonSuffixAndPrefix(current);
 		expect(strict?.apply(current)).toStrictEqual(final);
-		expect(strict?.replacements.toString()).toMatchInlineSnapshot(`"[69, 69) -> "\\t\\tthis.z = z;\\n""`);
+		expect(strict?.replacements.toString()).toMatchInlineSnapshot(`
+			"[69, 69) -> "		this.z = z;
+			""
+		`);
 		const lenient = tryRebaseStringEdits(text, edit, base, 'lenient')?.removeCommonSuffixAndPrefix(current);
 		expect(lenient?.apply(current)).toStrictEqual(final);
-		expect(lenient?.replacements.toString()).toMatchInlineSnapshot(`"[69, 69) -> "\\t\\tthis.z = z;\\n""`);
+		expect(lenient?.replacements.toString()).toMatchInlineSnapshot(`
+			"[69, 69) -> "		this.z = z;
+			""
+		`);
 	});
 	test('insert 2 and 2 edits', () => {
 		const text = `

src/extension/inlineEdits/test/node/ignoreImportChanges.spec.ts

@@ -48,7 +48,7 @@ class FooBar {
 `);
 
 		const lineEdit = RootedEdit.toLineEdit(await computeDiff(doc1, doc2));
-		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.edits[0], 'typescript', doc1.getLines())).toBe(true);
+		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.replacements[0], 'typescript', doc1.getLines())).toBe(true);
 	});
 
 
@@ -69,7 +69,7 @@ class FooBar {
 `);
 
 		const lineEdit = RootedEdit.toLineEdit(await computeDiff(doc1, doc2));
-		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.edits[0], 'typescript', doc1.getLines())).toBe(true);
+		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.replacements[0], 'typescript', doc1.getLines())).toBe(true);
 	});
 
 	test('ImportChange', async () => {
@@ -88,7 +88,7 @@ class FooBar {
 `);
 
 		const lineEdit = RootedEdit.toLineEdit(await computeDiff(doc1, doc2));
-		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.edits[0], 'typescript', doc1.getLines())).toBe(true);
+		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.replacements[0], 'typescript', doc1.getLines())).toBe(true);
 	});
 
 
@@ -109,6 +109,6 @@ class FooBar {
 `);
 
 		const lineEdit = RootedEdit.toLineEdit(await computeDiff(doc1, doc2));
-		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.edits[0], 'typescript', doc1.getLines())).toBe(false);
+		expect(IgnoreImportChangesAspect.isImportChange(lineEdit.replacements[0], 'typescript', doc1.getLines())).toBe(false);
 	});
 });

src/extension/inlineEdits/test/node/nextEditProviderCaching.spec.ts

@@ -76,7 +76,7 @@ describe('NextEditProvider Caching', () => {
 						)
 					]
 				);
-				lineEdit.edits.forEach(edit => pushEdit(Result.ok({ edit })));
+				lineEdit.replacements.forEach(edit => pushEdit(Result.ok({ edit })));
 				pushEdit(Result.error(new NoNextEditReason.NoSuggestions(request.documentBeforeEdits, undefined)));
 				return StatelessNextEditResult.streaming(telemetryBuilder);
 			}

src/extension/inlineEdits/vscode-node/components/logContextRecorder.ts

@@ -20,7 +20,7 @@ export class LogContextRecorder extends Disposable {
 	public readonly logFilePath: string;
 	private readonly _impl: Promise<LogContextRecorderImpl>;
 
-	private readonly _shownSuggestions: DisposableMap<number, { timeout: NodeJS.Timeout; dispose: () => void }>;
+	private readonly _shownSuggestions: DisposableMap<number, { timeout: TimeoutHandle; dispose: () => void }>;
 
 	constructor(
 		public readonly recordingDirPath: string,

src/extension/inlineEdits/vscode-node/inlineEditModel.ts

@@ -65,15 +65,15 @@ class LastChange extends Disposable {
 	public lastEditedTimestamp: number;
 	public lineNumberTriggers: Map<number /* lineNumber */, number /* timestamp */>;
 
-	private _timeout: NodeJS.Timeout | undefined;
-	public set timeout(value: NodeJS.Timeout | undefined) {
+	private _timeout: TimeoutHandle | undefined;
+	public set timeout(value: TimeoutHandle | undefined) {
 		if (value !== undefined) {
 			// TODO: we can end up collecting multiple timeouts, but also they could be cleared as debouncing happens
 			this._register(toDisposable(() => clearTimeout(value)));
 		}
 		this._timeout = value;
 	}
-	public get timeout(): NodeJS.Timeout | undefined {
+	public get timeout(): TimeoutHandle | undefined {
 		return this._timeout;
 	}