Skip to content

Commit 78ced63

Browse files
committed
undo source patches that aren't needed anymore
1 parent 52193cf commit 78ced63

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/vs/editor/common/tokenizationRegistry.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Color } from 'vs/base/common/color';
77
import { Emitter, Event } from 'vs/base/common/event';
88
import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
99
import { ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent, ITokenizationSupportFactory } from 'vs/editor/common/languages';
10+
import { ColorId } from 'vs/editor/common/encodedTokenAttributes';
1011

1112
export class TokenizationRegistry implements ITokenizationRegistry {
1213

@@ -104,8 +105,8 @@ export class TokenizationRegistry implements ITokenizationRegistry {
104105
}
105106

106107
public getDefaultBackground(): Color | null {
107-
if (this._colorMap && this._colorMap.length > /* ColorId.DefaultBackground */2) {
108-
return this._colorMap[/* ColorId.DefaultBackground */2];
108+
if (this._colorMap && this._colorMap.length > ColorId.DefaultBackground) {
109+
return this._colorMap[ColorId.DefaultBackground];
109110
}
110111
return null;
111112
}

src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
3131
import { StartupPageContribution, } from 'vs/workbench/contrib/welcomeGettingStarted/browser/startupPage';
3232
import { ExtensionsInput } from 'vs/workbench/contrib/extensions/common/extensionsInput';
3333

34-
// TODO@jrieken SWC change
35-
// export * as icons from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons';
36-
import * as icons from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons';
37-
export import icons = icons;
34+
35+
export * as icons from 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedIcons';
3836

3937
registerAction2(class extends Action2 {
4038
constructor() {

0 commit comments

Comments
 (0)