Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

extensions/markdown/src/tableOfContentsProvider.ts

@@ -3,22 +3,41 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as vscode from 'vscode';
 
 import { MarkdownEngine } from './markdownEngine';
 
+export class Slug {
+	public static fromHeading(heading: string): Slug {
+		const slugifiedHeading = encodeURI(heading.trim()
+			.toLowerCase()
+			.replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`]/g, '')
+			.replace(/\s+/g, '-')
+			.replace(/^\-+/, '')
+			.replace(/\-+$/, ''));
+
+		return new Slug(slugifiedHeading);
+	}
+
+	private constructor(
+		public readonly value: string
+	) { }
+
+	public equals(other: Slug): boolean {
+		return this.value === other.value;
+	}
+}
+
 export interface TocEntry {
-	slug: string;
-	text: string;
-	level: number;
-	line: number;
-	location: vscode.Location;
+	readonly slug: Slug;
+	readonly text: string;
+	readonly level: number;
+	readonly line: number;
+	readonly location: vscode.Location;
 }
 
 export class TableOfContentsProvider {
-	private toc: TocEntry[];
+	private toc?: TocEntry[];
 
 	public constructor(
 		private engine: MarkdownEngine,
@@ -36,14 +55,10 @@ export class TableOfContentsProvider {
 		return this.toc;
 	}
 
-	public async lookup(fragment: string): Promise<number> {
-		const slug = TableOfContentsProvider.slugify(fragment);
-		for (const entry of await this.getToc()) {
-			if (entry.slug === slug) {
-				return entry.line;
-			}
-		}
-		return NaN;
+	public async lookup(fragment: string): Promise<TocEntry | undefined> {
+		const toc = await this.getToc();
+		const slug = Slug.fromHeading(fragment);
+		return toc.find(entry => entry.slug.equals(slug));
 	}
 
 	private async buildToc(document: vscode.TextDocument): Promise<TocEntry[]> {
@@ -53,17 +68,13 @@ export class TableOfContentsProvider {
 		for (const heading of tokens.filter(token => token.type === 'heading_open')) {
 			const lineNumber = heading.map[0];
 			const line = document.lineAt(lineNumber);
-			const href = TableOfContentsProvider.slugify(line.text);
-			const level = TableOfContentsProvider.getHeaderLevel(heading.markup);
-			if (href) {
-				toc.push({
-					slug: href,
-					text: TableOfContentsProvider.getHeaderText(line.text),
-					level: level,
-					line: lineNumber,
-					location: new vscode.Location(document.uri, line.range)
-				});
-			}
+			toc.push({
+				slug: Slug.fromHeading(line.text),
+				text: TableOfContentsProvider.getHeaderText(line.text),
+				level: TableOfContentsProvider.getHeaderLevel(heading.markup),
+				line: lineNumber,
+				location: new vscode.Location(document.uri, line.range)
+			});
 		}
 		return toc;
 	}
@@ -81,14 +92,4 @@ export class TableOfContentsProvider {
 	private static getHeaderText(header: string): string {
 		return header.replace(/^\s*#+\s*(.*?)\s*#*$/, (_, word) => word.trim());
 	}
-
-	public static slugify(header: string): string {
-		return encodeURI(header.trim()
-			.toLowerCase()
-			.replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~\`]/g, '')
-			.replace(/\s+/g, '-')
-			.replace(/^\-+/, '')
-			.replace(/\-+$/, ''));
-	}
 }
-