Skip to content

Fixes #4345 - fix typos #4346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,4 @@ To add new icons to the GL Icons font follow the steps below:

```

Once you've finshed copy the new `glicons.woff2?<uuid>` URL from `src/webviews/apps/shared/glicons.scss` and search and replace the old references with the new one.
Once you've finished copy the new `glicons.woff2?<uuid>` URL from `src/webviews/apps/shared/glicons.scss` and search and replace the old references with the new one.
4 changes: 2 additions & 2 deletions src/@types/vscode.proposed.languageModels.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ declare module 'vscode' {
*/
export class LanguageModelError extends Error {
/**
* The requestor does not have permissions to use this
* The requester does not have permissions to use this
* language model
*/
static NoPermissions(message?: string): LanguageModelError;

/**
* The requestor is blocked from using this language model.
* The requester is blocked from using this language model.
*/
static Blocked(message?: string): LanguageModelError;

Expand Down
2 changes: 1 addition & 1 deletion src/env/node/git/git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export type GitResult<T extends string | Buffer | unknown> = {

export class Git implements Disposable {
private readonly _disposable: Disposable;
/** Map of running git commands -- avoids running duplicate overlaping commands */
/** Map of running git commands -- avoids running duplicate overlapping commands */
private readonly pendingCommands = new Map<string, Promise<RunResult<string | Buffer>>>();

constructor(container: Container) {
Expand Down
2 changes: 1 addition & 1 deletion src/plus/gk/__debug__accountDebug.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class AccountDebug {
iconPath: new ThemeIcon('blank'),
item: { state: SubscriptionState.Paid, planId: 'enterprise' },
},
// TODO: Update this subscription state once we have a "paid expired" state availale
// TODO: Update this subscription state once we have a "paid expired" state available
{
label: 'Paid (Expired)',
description: 'Community, account',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export class CloudIntegrationService {
}

if (refresh) {
// try once to just get the lastest token if the refresh fails, and give up if that fails too
// try once to just get the latest token if the refresh fails, and give up if that fails too
const newTokenRsp = await this.connection.fetchGkApi(
`v1/provider-tokens/${cloudIntegrationType}`,
{ method: 'GET' },
Expand Down
2 changes: 1 addition & 1 deletion src/plus/integrations/providers/bitbucket/bitbucket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ export class BitbucketApi implements Disposable {
if (ex.original instanceof ProviderFetchError) {
const json = await ex.original.response.json();
if (json?.error === 'Invalid or unknown installation') {
// TODO: In future get it on to home as an worning on the integratin istelf "this integration has issues"
// TODO: In future get it on to home as an warning on the integration itself "this integration has issues"
// even user suppresses the message it's still visible with some capacity. It's a broader thing to get other errors.
const commitWebUrl = `https://bitbucket.org/${owner}/${repo}/commits/${rev}`;
void showBitbucketPRCommitLinksAppNotInstalledWarningMessage(commitWebUrl);
Expand Down
4 changes: 2 additions & 2 deletions src/system/-webview/asyncDebouncer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface AsyncTask<T> {
* Here the debouncer returns a promise that awaits task for completion.
* Also we can let tasks know if they are cancelled by passing a cancellation token.
*
* Despite being able to accept synchronous tasks, we always return a promise here. It's implemeted this way for simplicity.
* Despite being able to accept synchronous tasks, we always return a promise here. It's implemented this way for simplicity.
*/
export function createAsyncDebouncer<T>(
delay: number,
Expand Down Expand Up @@ -97,7 +97,7 @@ export function createAsyncDebouncer<T>(
} catch (e) {
if (cancellation.token.isCancellationRequested) {
// The current execution has been cancelled so we don't want to reject the main promise,
// because that's expected that it can be fullfilled by the next task.
// because that's expected that it can be fulfilled by the next task.
// (If the whole task is cancelled, the main promise will be rejected in the cancel() method)
if (curDeferred !== deferred && deferred.pending) {
// Unlikely we get here, but if the local `deferred` is different from the main one, then we cancel it to not let the clients hang.
Expand Down
2 changes: 1 addition & 1 deletion src/system/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ export function formatHex(color: Color): string {

/**
* Formats the color as #RRGGBBAA
* If 'compact' is set, colors without transparancy will be printed as #RRGGBB
* If 'compact' is set, colors without transparency will be printed as #RRGGBB
*/
export function formatHexA(color: Color, compact = false): string {
if (compact && color.rgba.a === 1) {
Expand Down
4 changes: 2 additions & 2 deletions src/system/promise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export type PromiseOrValue<T> = Promise<T> | T;
export function any<T>(...promises: Promise<T>[]): Promise<T> {
return new Promise<T>((resolve, reject) => {
let settled = false;
const onFullfilled = (r: T) => {
const onFulfilled = (r: T) => {
settled = true;
resolve(r);
};
Expand All @@ -31,7 +31,7 @@ export function any<T>(...promises: Promise<T>[]): Promise<T> {
};

for (const promise of promises) {
promise.then(onFullfilled, onRejected);
promise.then(onFulfilled, onRejected);
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/webviews/apps/plus/shared/components/account-chip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -442,10 +442,10 @@ export class GlAccountChip extends LitElement {
},
},
)}"
aria-label="Ugrade to Advanced"
aria-label="Upgrade to Advanced"
><span class="upgrade-button">Upgrade</span
><span slot="tooltip"
>Ugrade to the Advanced plan for access to self-hosted integrations,
>Upgrade to the Advanced plan for access to self-hosted integrations,
advanced AI features @ 500K tokens/week, and more</span
>
</gl-button>
Expand Down