From dfe23f7bfefa0fc4dd6fc410d9ceda886550e4c1 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Wed, 20 Mar 2019 11:30:06 -0700
Subject: [PATCH] Remove some CARBON Edits (#4571)

* remove some unnecessary sql carbon edits to vs source and adds correct fix where necessary

* revert bad change
---
 extensions/mssql/package.json                 | 11 -----
 src/vs/base/common/numbers.ts                 | 48 -------------------
 .../common/services/languagesRegistry.ts      |  5 +-
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
index e3f2959af9..986bda51e6 100644
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -36,17 +36,6 @@
   },
   "devDependencies": {},
   "contributes": {
-    "languages": [
-      {
-        "id": "sql",
-        "extensions": [
-          ".sql"
-        ],
-        "aliases": [
-          "SQL"
-        ]
-      }
-    ],
     "commands": [
       {
         "command": "mssqlCluster.uploadFiles",
diff --git a/src/vs/base/common/numbers.ts b/src/vs/base/common/numbers.ts
index 75e5bc7c48..1fba04f8b3 100644
--- a/src/vs/base/common/numbers.ts
+++ b/src/vs/base/common/numbers.ts
@@ -3,11 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-// {{SQL CARBON EDIT}}
-import types = require('vs/base/common/types');
-
 export function clamp(value: number, min: number, max: number): number {
 	return Math.min(Math.max(value, min), max);
 }
@@ -16,49 +11,6 @@ export function rot(index: number, modulo: number): number {
 	return (modulo + (index % modulo)) % modulo;
 }
 
-// {{SQL CARBON EDIT}}
-export type NumberCallback = (index: number) => void;
-
-// {{SQL CARBON EDIT}}
-export function count(to: number, callback: NumberCallback): void;
-export function count(from: number, to: number, callback: NumberCallback): void;
-export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, callback?: NumberCallback): any {
-	let from: number;
-	let to: number;
-
-	if (types.isNumber(toOrCallback)) {
-		from = fromOrTo;
-		to = <number>toOrCallback;
-	} else {
-		from = 0;
-		to = fromOrTo;
-		callback = <NumberCallback>toOrCallback;
-	}
-
-	const op = from <= to ? (i: number) => i + 1 : (i: number) => i - 1;
-	const cmp = from <= to ? (a: number, b: number) => a < b : (a: number, b: number) => a > b;
-
-	for (let i = from; cmp(i, to); i = op(i)) {
-		callback(i);
-	}
-}
-
-export function countToArray(to: number): number[];
-export function countToArray(from: number, to: number): number[];
-export function countToArray(fromOrTo: number, to?: number): number[] {
-	const result: number[] = [];
-	const fn = (i: number) => result.push(i);
-
-	if (types.isUndefined(to)) {
-		count(fromOrTo, fn);
-	} else {
-		count(fromOrTo, to, fn);
-	}
-
-	return result;
-}
-// {{END SQL CARBON EDIT}}
-
 export class Counter {
 	private _next = 0;
 
diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts
index 1326a17b81..f2d27baef5 100644
--- a/src/vs/editor/common/services/languagesRegistry.ts
+++ b/src/vs/editor/common/services/languagesRegistry.ts
@@ -155,10 +155,7 @@ export class LanguagesRegistry extends Disposable {
 		if (Array.isArray(lang.extensions)) {
 			for (let extension of lang.extensions) {
 				mime.registerTextMime({ id: langId, mime: primaryMime, extension: extension }, this._warnOnOverwrite);
-				// {{SQL CARBON EDIT}}
-				if (!resolvedLanguage.extensions.includes(extension)) {
-					resolvedLanguage.extensions.push(extension);
-				}
+				resolvedLanguage.extensions.push(extension);
 			}
 		}