Spelling fixes

extensions/merge-conflict/src/commandHandler.ts

@@ -127,7 +127,7 @@ export default class CommandHandler implements vscode.Disposable {
 
 		// Figure out if the cursor is in current or incoming, we do this by seeing if
 		// the active position is before or after the range of the splitter or common
-		// ancesors marker. We can use this trick as the previous check in
+		// ancestors marker. We can use this trick as the previous check in
 		// findConflictByActiveSelection will ensure it's within the conflict range, so
 		// we don't falsely identify "current" or "incoming" if outside of a conflict range.
 		if (editor.selection.active.isBefore(tokenAfterCurrentBlock.start)) {
@@ -184,7 +184,7 @@ export default class CommandHandler implements vscode.Disposable {
 			conflict = args[1];
 		}
 		else {
-			// Attempt to find a conflict that matches the current curosr position
+			// Attempt to find a conflict that matches the current cursor position
 			conflict = await this.findConflictContainingSelection(editor);
 		}
 

extensions/merge-conflict/src/documentTracker.ts

@@ -57,7 +57,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
 		let key = this.getCacheKey(document);
 
 		if (!key) {
-			// Document doesnt have a uri, can't cache it, so return
+			// Document doesn't have a uri, can't cache it, so return
 			return Promise.resolve(this.getConflictsOrEmpty(document, [origin]));
 		}
 

extensions/merge-conflict/src/mergeConflictParser.ts

@@ -22,7 +22,7 @@ export class MergeConflictParser {
 
 	static scanDocument(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
 
-		// Scan each line in the document, we already know there is atleast a <<<<<<< and
+		// Scan each line in the document, we already know there is at least a <<<<<<< and
 		// >>>>>> marker within the document, we need to group these into conflict ranges.
 		// We initially build a scan match, that references the lines of the header, splitter
 		// and footer. This is then converted into a full descriptor containing all required
@@ -61,7 +61,7 @@ export class MergeConflictParser {
 			else if (currentConflict && !currentConflict.splitter && line.text.startsWith(splitterMarker)) {
 				currentConflict.splitter = line;
 			}
-			// Are we withon a conflict block and is this a footer? >>>>>>>
+			// Are we within a conflict block and is this a footer? >>>>>>>
 			else if (currentConflict && line.text.startsWith(endFooterMarker)) {
 				currentConflict.endFooter = line;
 
@@ -92,9 +92,9 @@ export class MergeConflictParser {
 
 		let tokenAfterCurrentBlock: vscode.TextLine = scanned.commonAncestors[0] || scanned.splitter;
 
-		// Assume that descriptor.current.header, descriptor.incoming.header and descriptor.spliiter
+		// Assume that descriptor.current.header, descriptor.incoming.header and descriptor.splitter
 		// have valid ranges, fill in content and total ranges from these parts.
-		// NOTE: We need to shift the decortator range back one character so the splitter does not end up with
+		// NOTE: We need to shift the decorator range back one character so the splitter does not end up with
 		// two decoration colors (current and splitter), if we take the new line from the content into account
 		// the decorator will wrap to the next line.
 		return {