Skip to content

Commit bc110db

Browse files
committed
debt: remove usages of deprecated startsWith util
1 parent bba19cf commit bc110db

4 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/vs/platform/userDataSync/common/extensionsMerge.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { ISyncExtension } from 'vs/platform/userDataSync/common/userDataSync';
77
import { IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
8-
import { startsWith } from 'vs/base/common/strings';
98
import { deepClone } from 'vs/base/common/objects';
109
import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
1110
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -189,7 +188,7 @@ function massageOutgoingExtension(extension: ISyncExtension, key: string): ISync
189188
const massagedExtension: ISyncExtension = {
190189
identifier: {
191190
id: extension.identifier.id,
192-
uuid: startsWith(key, 'uuid:') ? key.substring('uuid:'.length) : undefined
191+
uuid: key.startsWith('uuid:') ? key.substring('uuid:'.length) : undefined
193192
},
194193
};
195194
if (extension.disabled) {
@@ -210,7 +209,7 @@ export function getIgnoredExtensions(installed: ILocalExtension[], configuration
210209
const added: string[] = [], removed: string[] = [];
211210
if (Array.isArray(value)) {
212211
for (const key of value) {
213-
if (startsWith(key, '-')) {
212+
if (key.startsWith('-')) {
214213
removed.push(key.substring(1));
215214
} else {
216215
added.push(key);

src/vs/platform/userDataSync/common/settingsMerge.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as contentUtil from 'vs/platform/userDataSync/common/content';
1212
import { IConflictSetting, getDisallowedIgnoredSettings } from 'vs/platform/userDataSync/common/userDataSync';
1313
import { firstIndex, distinct } from 'vs/base/common/arrays';
1414
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
15-
import { startsWith } from 'vs/base/common/strings';
1615

1716
export interface IMergeResult {
1817
localContent: string | null;
@@ -34,7 +33,7 @@ export function getIgnoredSettings(defaultIgnoredSettings: string[], configurati
3433
const added: string[] = [], removed: string[] = [...getDisallowedIgnoredSettings()];
3534
if (Array.isArray(value)) {
3635
for (const key of value) {
37-
if (startsWith(key, '-')) {
36+
if (key.startsWith('-')) {
3837
removed.push(key.substring(1));
3938
} else {
4039
added.push(key);

src/vs/workbench/contrib/markers/browser/markersFilterOptions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class FilterOptions {
3434
if (filter) {
3535
const filters = splitGlobAware(filter, ',').map(s => s.trim()).filter(s => !!s.length);
3636
for (const f of filters) {
37-
if (strings.startsWith(f, '!')) {
37+
if (f.startsWith('!')) {
3838
this.setPattern(excludesExpression, strings.ltrim(f, '!'));
3939
} else {
4040
this.setPattern(includeExpression, f);

src/vs/workbench/services/userData/common/fileUserDataProvider.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Event, Emitter } from 'vs/base/common/event';
77
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
88
import { IFileSystemProviderWithFileReadWriteCapability, IFileChange, IWatchOptions, IStat, FileOverwriteOptions, FileType, FileWriteOptions, FileDeleteOptions, FileSystemProviderCapabilities, IFileSystemProviderWithOpenReadWriteCloseCapability, FileOpenOptions, hasReadWriteCapability, hasOpenReadWriteCloseCapability, IFileSystemProviderWithFileReadStreamCapability, FileReadStreamOptions, hasFileReadStreamCapability } from 'vs/platform/files/common/files';
99
import { URI } from 'vs/base/common/uri';
10-
import { startsWith } from 'vs/base/common/strings';
1110
import { BACKUPS } from 'vs/platform/environment/common/environment';
1211
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
1312
import { CancellationToken } from 'vs/base/common/cancellation';
@@ -141,7 +140,7 @@ export class FileUserDataProvider extends Disposable implements
141140

142141
private toFileSystemResource(userDataResource: URI): URI {
143142
const relativePath = this.extUri.relativePath(this.userDataHome, userDataResource)!;
144-
if (startsWith(relativePath, BACKUPS)) {
143+
if (relativePath.startsWith(BACKUPS)) {
145144
return this.extUri.joinPath(this.extUri.dirname(this.fileSystemBackupsHome), relativePath);
146145
}
147146
return this.extUri.joinPath(this.fileSystemUserDataHome, relativePath);

0 commit comments

Comments
 (0)