Skip to content

Vscode 1.52.1 #2543

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.

Sign up for GitHub

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

Merged
merged 14 commits into from
Feb 9, 2021
Merged

Vscode 1.52.1 #2543

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e4a830e
Squashed 'lib/vscode/' changes from e5a624b788..3e344b17b7
code-asher Feb 9, 2021
859de79
Update to VS Code 1.52.1
code-asher Feb 9, 2021
9221efc
Restore Node check
code-asher Feb 9, 2021
0a1a8fe
Remove new .yarnrc
code-asher Feb 9, 2021
80d5005
Remove electron and resolve yarn.lock conflict
code-asher Feb 9, 2021
14c96d7
Remove added logLevel
code-asher Feb 9, 2021
89c38d3
Update storage promise
code-asher Feb 9, 2021
cc59279
Remove GoHomeContributor
code-asher Feb 9, 2021
f8d546b
Remove hidden home CSS
code-asher Feb 9, 2021
a6d4b24
Resolve extensions viewlet conflicts
code-asher Feb 9, 2021
a652318
Fall back to remote extension server on web
code-asher Feb 9, 2021
068e399
Remove Node browser shim
code-asher Feb 9, 2021
948e01f
Bundle jpg from VS Code
code-asher Feb 9, 2021
898565e
Resolve browser telemetry conflict
code-asher Feb 9, 2021
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
Prev Previous commit
Next Next commit
Resolve extensions viewlet conflicts
  • Loading branch information
@code-asher
code-asher committed Feb 9, 2021
commit a6d4b24733ef7da9292e572100953153579180bf
9 changes: 1 addition & 8 deletions lib/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
import Severity from 'vs/base/common/severity';
import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
<<<<<<< HEAD
import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
=======
import { IThemeService, ThemeIcon } from 'vs/platform/theme/common/themeService';
>>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775
import { IThemeService, registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IViewsRegistry, IViewDescriptor, Extensions, ViewContainer, IViewDescriptorService, IAddedViewDescriptorRef } from 'vs/workbench/common/views';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
Expand Down Expand Up @@ -65,13 +61,10 @@ import { SIDE_BAR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
import { WorkbenchStateContext } from 'vs/workbench/browser/contextkeys';
import { ICommandService } from 'vs/platform/commands/common/commands';
<<<<<<< HEAD
import { textLinkForeground } from 'vs/platform/theme/common/colorRegistry';
=======
import { isWeb } from 'vs/base/common/platform';
import { memoize } from 'vs/base/common/decorators';
import { filterIcon } from 'vs/workbench/contrib/extensions/browser/extensionsIcons';
>>>>>>> e4a830e9b7ca039c7c70697786d29f5b6679d775

const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
const SearchMarketplaceExtensionsContext = new RawContextKey<boolean>('searchMarketplaceExtensions', false);
Expand Down