Update and reorganize

Author: micnil

package-lock.json

@@ -7,11 +7,11 @@
   "dependencies": {},
   "devDependencies": {
     "@types/assert": "^1.5.6",
-    "@types/mocha": "^8.2.0",
+    "@types/mocha": "^9.1.1",
     "assert": "^2.0.0",
-    "mocha": "^8.2.1",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.4.3"
+    "mocha": "^9.2.2",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4"
   },
   "scripts": {
     "test": "mocha -u tdd --require ts-node/register test/**/*.ts",

package.json

@@ -1,6 +1,5 @@
-export * from './diffComputer';
-export * from './diff';
-export * from './charCode';
-export * from './diffChange';
-export * from './editorCommon';
-export * from './strings';
+export * from 'vs/editor/common/diff/linesDiffComputer';
+export * from './vs/base/common/diff/diff';
+export * from './vs/base/common/diff/diffChange';
+export * from './vs/editor/common/diff/smartLinesDiffComputer';
+export * from './vs/editor/common/diff/standardLinesDiffComputer';

src/editorCommon.ts

@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BugIndicatingError, onUnexpectedError } from 'vs/base/common/errors';
+
+/**
+ * Throws an error with the provided message if the provided value does not evaluate to a true Javascript value.
+ *
+ * @deprecated Use `assert(...)` instead.
+ * This method is usually used like this:
+ * ```ts
+ * import * as assert from 'vs/base/common/assert';
+ * assert.ok(...);
+ * ```
+ *
+ * However, `assert` in that example is a user chosen name.
+ * There is no tooling for generating such an import statement.
+ * Thus, the `assert(...)` function should be used instead.
+ */
+export function ok(value?: unknown, message?: string) {
+	if (!value) {
+		throw new Error(message ? `Assertion failed (${message})` : 'Assertion Failed');
+	}
+}
+
+export function assertNever(value: never, message = 'Unreachable'): never {
+	throw new Error(message);
+}
+
+export function assert(condition: boolean): void {
+	if (!condition) {
+		throw new BugIndicatingError('Assertion Failed');
+	}
+}
+
+/**
+ * condition must be side-effect free!
+ */
+export function assertFn(condition: () => boolean): void {
+	if (!condition()) {
+		// eslint-disable-next-line no-debugger
+		debugger;
+		// Reevaluate `condition` again to make debugging easier
+		condition();
+		onUnexpectedError(new BugIndicatingError('Assertion Failed'));
+	}
+}
+
+export function checkAdjacentItems<T>(items: readonly T[], predicate: (item1: T, item2: T) => boolean): boolean {
+	let i = 0;
+	while (i < items.length - 1) {
+		const a = items[i];
+		const b = items[i + 1];
+		if (!predicate(a, b)) {
+			return false;
+		}
+		i++;
+	}
+	return true;
+}

src/index.ts

@@ -1,4 +1,3 @@
-// Updated from commit 94428f89bf25e3df92827c5bc677da8452aa7d12 - vscode/src/vs/base/common/charCode.ts
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
@@ -10,7 +9,7 @@
  * An inlined enum containing useful character codes (to be used with String.charCodeAt).
  * Please leave the const keyword such that it gets inlined when compiled to JavaScript!
  */
- export const enum CharCode {
+export const enum CharCode {
 	Null = 0,
 	/**
 	 * The `\b` character.
@@ -226,6 +225,12 @@
 	 */
 	Tilde = 126,
 
+	/**
+	 * The   (no-break space) character.
+	 * Unicode Character 'NO-BREAK SPACE' (U+00A0)
+	 */
+	NoBreakSpace = 160,
+
 	U_Combining_Grave_Accent = 0x0300,								//	U+0300	Combining Grave Accent
 	U_Combining_Acute_Accent = 0x0301,								//	U+0301	Combining Acute Accent
 	U_Combining_Circumflex_Accent = 0x0302,							//	U+0302	Combining Circumflex Accent
@@ -424,6 +429,12 @@
 	U_GREEK_OXIA = 0x1FFD,									// U+1FFD	GREEK OXIA
 	U_GREEK_DASIA = 0x1FFE,									// U+1FFE	GREEK DASIA
 
+	U_IDEOGRAPHIC_FULL_STOP = 0x3002,						// U+3002	IDEOGRAPHIC FULL STOP
+	U_LEFT_CORNER_BRACKET = 0x300C,							// U+300C	LEFT CORNER BRACKET
+	U_RIGHT_CORNER_BRACKET = 0x300D,						// U+300D	RIGHT CORNER BRACKET
+	U_LEFT_BLACK_LENTICULAR_BRACKET = 0x3010,				// U+3010	LEFT BLACK LENTICULAR BRACKET
+	U_RIGHT_BLACK_LENTICULAR_BRACKET = 0x3011,				// U+3011	RIGHT BLACK LENTICULAR BRACKET
+
 
 	U_OVERLINE = 0x203E, // Unicode Character 'OVERLINE'
 
@@ -432,5 +443,8 @@
 	 * Unicode Character 'ZERO WIDTH NO-BREAK SPACE' (U+FEFF)
 	 * http://www.fileformat.info/info/unicode/char/feff/index.htm
 	 */
-	UTF8_BOM = 65279
+	UTF8_BOM = 65279,
+
+	U_FULLWIDTH_SEMICOLON = 0xFF1B,							// U+FF1B	FULLWIDTH SEMICOLON
+	U_FULLWIDTH_COMMA = 0xFF0C,								// U+FF0C	FULLWIDTH COMMA
 }

src/vs/base/common/assert.ts

@@ -1,12 +1,11 @@
-// Updated from commit 77905c850e170eab00cac5ca190c7b1fe5ad43ba - vscode/src/vs/base/common/diff/diff.ts
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DiffChange } from './diffChange';
-import { stringHash } from './hash';
-import { Constants } from './uint';
+import { DiffChange } from 'vs/base/common/diff/diffChange';
+import { stringHash } from 'vs/base/common/hash';
+import { Constants } from 'vs/base/common/uint';
 
 export class StringDiffSequence implements ISequence {
 
@@ -70,7 +69,7 @@ export interface IDiffResult {
 // The code below has been ported from a C# implementation in VS
 //
 
-export class Debug {
+class Debug {
 
 	public static Assert(condition: boolean, message: string): void {
 		if (!condition) {
@@ -79,7 +78,7 @@ export class Debug {
 	}
 }
 
-export class MyArray {
+class MyArray {
 	/**
 	 * Copies a range of elements from an Array starting at the specified source index and pastes
 	 * them to another Array starting at the specified destination index. The length and the indexes
@@ -852,7 +851,7 @@ export class LcsDiff {
 				change.modifiedStart++;
 			}
 
-			let mergedChangeArr: Array<DiffChange | null> = [null];
+			const mergedChangeArr: Array<DiffChange | null> = [null];
 			if (i < changes.length - 1 && this.ChangesOverlap(changes[i], changes[i + 1], mergedChangeArr)) {
 				changes[i] = mergedChangeArr[0]!;
 				changes.splice(i + 1, 1);
@@ -1048,7 +1047,7 @@ export class LcsDiff {
 	 * @returns The concatenated list
 	 */
 	private ConcatenateChanges(left: DiffChange[], right: DiffChange[]): DiffChange[] {
-		let mergedChangeArr: DiffChange[] = [];
+		const mergedChangeArr: DiffChange[] = [];
 
 		if (left.length === 0 || right.length === 0) {
 			return (right.length > 0) ? right : left;

src/charCode.ts renamed to src/vs/base/common/charCode.ts

@@ -1,4 +1,3 @@
-// Updated from commit d4edb9abcc261846cabee6702715fe2914ae42cb - vscode/src/vs/base/common/diff/diffChange.ts
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
@@ -7,7 +6,7 @@
 /**
  * Represents information about a specific difference between two sequences.
  */
- export class DiffChange {
+export class DiffChange {
 
 	/**
 	 * The position of the first element in the original sequence which