Skip to content

Commit 20cf247

Browse files
LixireLixire
committed
Spelling fixes
1 parent 42f932b commit 20cf247

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎extensions/merge-conflict/src/commandHandler.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default class CommandHandler implements vscode.Disposable {
127127

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

‎extensions/merge-conflict/src/documentTracker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
5757
let key = this.getCacheKey(document);
5858

5959
if (!key) {
60-
// Document doesnt have a uri, can't cache it, so return
60+
// Document doesn't have a uri, can't cache it, so return
6161
return Promise.resolve(this.getConflictsOrEmpty(document, [origin]));
6262
}
6363

‎extensions/merge-conflict/src/mergeConflictParser.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class MergeConflictParser {
2222

2323
static scanDocument(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
2424

25-
// Scan each line in the document, we already know there is atleast a <<<<<<< and
25+
// Scan each line in the document, we already know there is at least a <<<<<<< and
2626
// >>>>>> marker within the document, we need to group these into conflict ranges.
2727
// We initially build a scan match, that references the lines of the header, splitter
2828
// and footer. This is then converted into a full descriptor containing all required
@@ -61,7 +61,7 @@ export class MergeConflictParser {
6161
else if (currentConflict && !currentConflict.splitter && line.text.startsWith(splitterMarker)) {
6262
currentConflict.splitter = line;
6363
}
64-
// Are we withon a conflict block and is this a footer? >>>>>>>
64+
// Are we within a conflict block and is this a footer? >>>>>>>
6565
else if (currentConflict && line.text.startsWith(endFooterMarker)) {
6666
currentConflict.endFooter = line;
6767

@@ -92,9 +92,9 @@ export class MergeConflictParser {
9292

9393
let tokenAfterCurrentBlock: vscode.TextLine = scanned.commonAncestors[0] || scanned.splitter;
9494

95-
// Assume that descriptor.current.header, descriptor.incoming.header and descriptor.spliiter
95+
// Assume that descriptor.current.header, descriptor.incoming.header and descriptor.splitter
9696
// have valid ranges, fill in content and total ranges from these parts.
97-
// NOTE: We need to shift the decortator range back one character so the splitter does not end up with
97+
// NOTE: We need to shift the decorator range back one character so the splitter does not end up with
9898
// two decoration colors (current and splitter), if we take the new line from the content into account
9999
// the decorator will wrap to the next line.
100100
return {

0 commit comments

Comments
 (0)