Skip to content

Commit d75f909

Browse files
committed
fix typo: consecutive-word duplications
This fixes unintentional duplications of words, such as `the the`, and `can can` etc. I also take the chance to make a few wording tweaks to avoid suspicious duplications.
1 parent 615732f commit d75f909

11 files changed

Lines changed: 14 additions & 14 deletions

File tree

extensions/merge-conflict/src/documentMergeConflict.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
3535
public applyEdit(type: interfaces.CommitType, document: vscode.TextDocument, edit: { replace(range: vscode.Range, newText: string): void; }): void {
3636

3737
// Each conflict is a set of ranges as follows, note placements or newlines
38-
// which may not in in spans
38+
// which may not in spans
3939
// [ Conflict Range -- (Entire content below)
4040
// [ Current Header ]\n -- >>>>> Header
4141
// [ Current Content ] -- (content)
@@ -75,4 +75,4 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
7575
private isNewlineOnly(text: string) {
7676
return text === '\n' || text === '\r\n';
7777
}
78-
}
78+
}

src/vs/base/browser/ui/scrollbar/scrollableElement.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class MouseWheelClassifier {
6464
return false;
6565
}
6666

67-
// 0.5 * last + 0.25 * before last + 0.125 * before before last + ...
67+
// 0.5 * last + 0.25 * 2nd last + 0.125 * 3rd last + ...
6868
let remainingInfluence = 1;
6969
let score = 0;
7070
let iteration = 1;

src/vs/base/parts/ipc/node/ipc.net.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class NodeSocket implements ISocket {
5656
// anyways and nodejs is already doing that for us:
5757
// > https://nodejs.org/api/stream.html#stream_writable_write_chunk_encoding_callback
5858
// > However, the false return value is only advisory and the writable stream will unconditionally
59-
// > accept and buffer chunk even if it has not not been allowed to drain.
59+
// > accept and buffer chunk even if it has not been allowed to drain.
6060
this.socket.write(<Buffer>buffer.buffer);
6161
}
6262

src/vs/editor/browser/viewParts/selections/selections.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
369369
private _previousFrameVisibleRangesWithStyle: (LineVisibleRangesWithStyle[] | null)[] = [];
370370
public prepareRender(ctx: RenderingContext): void {
371371

372-
// Build HTML for inner corners separate from HTML for the the rest of selections,
372+
// Build HTML for inner corners separate from HTML for the rest of selections,
373373
// as the inner corner HTML can interfere with that of other selections.
374374
// In final render, make sure to place the inner corner HTML before the rest of selection HTML. See issue #77777.
375375
const output: [string, string][] = [];

src/vs/editor/contrib/find/test/find.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ suite('Find', () => {
7575
let searchStringSelectionTwoLines = getSelectionSearchString(editor);
7676
assert.equal(searchStringSelectionTwoLines, null);
7777

78-
// Select end of first line newline and and chunk of second
78+
// Select end of first line newline and chunk of second
7979
editor.setSelection(new Range(1, 7, 2, 4));
8080
let searchStringSelectionSpanLines = getSelectionSearchString(editor);
8181
assert.equal(searchStringSelectionSpanLines, null);

src/vs/editor/contrib/gotoSymbol/goToCommands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ abstract class SymbolNavigationAction extends EditorAction {
152152

153153
private async _openReference(editor: ICodeEditor, editorService: ICodeEditorService, reference: Location | LocationLink, sideBySide: boolean, highlight: boolean): Promise<ICodeEditor | undefined> {
154154
// range is the target-selection-range when we have one
155-
// and the the fallback is the 'full' range
155+
// and the fallback is the 'full' range
156156
let range: IRange | undefined = undefined;
157157
if (isLocationLink(reference)) {
158158
range = reference.targetSelectionRange;

src/vs/vscode.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4925,7 +4925,7 @@ declare module 'vscode' {
49254925
* The extension kind describes if an extension runs where the UI runs
49264926
* or if an extension runs where the remote extension host runs. The extension kind
49274927
* is defined in the `package.json`-file of extensions but can also be refined
4928-
* via the the `remote.extensionKind`-setting. When no remote extension host exists,
4928+
* via the `remote.extensionKind`-setting. When no remote extension host exists,
49294929
* the value is [`ExtensionKind.UI`](#ExtensionKind.UI).
49304930
*/
49314931
extensionKind: ExtensionKind;

src/vs/workbench/contrib/customEditor/browser/webviewEditor.contribution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
5858
},
5959
'filenamePattern': {
6060
type: 'string',
61-
description: nls.localize('editor.editorAssociations.filenamePattern', "Glob pattern the the editor should be used for."),
61+
description: nls.localize('editor.editorAssociations.filenamePattern', "Glob pattern the editor should be used for."),
6262
}
6363
}
6464
}

src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ export class SimpleFileDialog {
553553
} else if (this.endsWithSlash(value)) {
554554
// The input box contains a path that doesn't exist on the system.
555555
this.filePickBox.validationMessage = nls.localize('remoteFileDialog.badPath', 'The path does not exist.');
556-
// Save this bad path. It can take too long to to a stat on every user entered character, but once a user enters a bad path they are likely
556+
// Save this bad path. It can take too long to a stat on every user entered character, but once a user enters a bad path they are likely
557557
// to keep typing more bad path. We can compare against this bad path and see if the user entered path starts with it.
558558
this.badPath = value;
559559
return UpdateResult.InvalidPath;

src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@ export class TextFileEditorModelManager extends Disposable implements ITextFileE
282282
this.mapResourceToModel.clear();
283283
this.mapResourceToPendingModelLoaders.clear();
284284

285-
// dispose dispose listeners
285+
// dispose the dispose listeners
286286
this.mapResourceToDisposeListener.forEach(l => l.dispose());
287287
this.mapResourceToDisposeListener.clear();
288288

289-
// dispose state change listeners
289+
// dispose the state change listeners
290290
this.mapResourceToStateChangeListener.forEach(l => l.dispose());
291291
this.mapResourceToStateChangeListener.clear();
292292

293-
// dispose model content change listeners
293+
// dispose the model content change listeners
294294
this.mapResourceToModelContentChangeListener.forEach(l => l.dispose());
295295
this.mapResourceToModelContentChangeListener.clear();
296296
}

0 commit comments

Comments
 (0)