development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 01:37:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into sandy081/statusOcticons

Browse source
This commit is contained in:
Sandeep Somavarapu 2019-06-05 22:46:43 +02:00
commit 0ed7ab83d2
6 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
View file

@ -11,7 +11,7 @@ import { IMarker, MarkerSeverity, IRelatedInformation } from 'vs/platform/marker
import { Position } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { registerColor, oneOf, textLinkForeground, editorErrorForeground, editorWarningForeground, editorInfoForeground, editorErrorBorder, editorWarningBorder, editorInfoBorder } from 'vs/platform/theme/common/colorRegistry';
import { registerColor, oneOf, textLinkForeground, editorErrorForeground, editorErrorBorder, editorWarningForeground, editorWarningBorder, editorInfoForeground, editorInfoBorder } from 'vs/platform/theme/common/colorRegistry';
import { IThemeService, ITheme, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
import { Color } from 'vs/base/common/color';
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';

7
src/vs/workbench/browser/media/images/activitybar/git-alt1.svg
View file

@ -1,10 +1,15 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M20.7001 6.79651C20.3124 5.90153 19.5985 5.18769 18.7036 4.80001C18.2455 4.59916 17.7502 4.49695 17.2501 4.50001C16.748 4.4974 16.2509 4.59957 15.7906 4.80001C15.3435 4.99198 14.9364 5.26624 14.5906 5.60851C14.2504 5.95083 13.9781 6.35443 13.7881 6.79801C13.5935 7.25714 13.4955 7.75138 13.5001 8.25001C13.4977 8.67564 13.5713 9.09827 13.7176 9.49801C13.8594 9.88691 14.0619 10.2509 14.3176 10.5765C14.5726 10.9022 14.8816 11.1817 15.2311 11.403C15.59 11.6308 15.9844 11.7971 16.3981 11.895C16.3285 12.1273 16.2216 12.3466 16.0816 12.5445C15.9452 12.7392 15.7792 12.9113 15.5896 13.0545C15.4011 13.196 15.1916 13.3069 14.9686 13.383C14.7373 13.462 14.4944 13.5015 14.2501 13.5H9.75006C9.34712 13.4992 8.94696 13.5666 8.56656 13.6995C8.18255 13.8326 7.82245 14.0265 7.50006 14.274V7.41751C7.925 7.3351 8.33154 7.17655 8.70006 6.94951C9.05989 6.72813 9.3807 6.44888 9.64956 6.12301C9.91679 5.7956 10.1267 5.42539 10.2706 5.02801C10.4219 4.61889 10.4996 4.18621 10.5001 3.75001C10.5031 3.24983 10.4009 2.7546 10.2001 2.29651C9.81238 1.40153 9.09854 0.687687 8.20356 0.300006C7.74547 0.09916 7.25024 -0.00305398 6.75006 5.67945e-06C6.24799 -0.00260461 5.7509 0.0995727 5.29056 0.300006C4.84346 0.491981 4.4364 0.766237 4.09056 1.10851C3.75042 1.45083 3.47813 1.85443 3.28806 2.29801C3.09351 2.75714 2.99548 3.25138 3.00006 3.75001C2.99744 4.61508 3.29602 5.45408 3.84456 6.12301C4.11251 6.4492 4.43289 6.72851 4.79256 6.94951C5.16337 7.17739 5.57253 7.33597 6.00006 7.41751V16.5825C5.57253 16.664 5.16337 16.8226 4.79256 17.0505C4.43289 17.2715 4.11251 17.5508 3.84456 17.877C3.29602 18.5459 2.99744 19.3849 3.00006 20.25C2.99715 20.7513 3.09669 21.248 3.29256 21.7095C3.67082 22.6117 4.38834 23.3293 5.29056 23.7075C5.75207 23.9034 6.24872 24.0029 6.75006 24C7.25004 24.001 7.74484 23.8989 8.20356 23.7C8.64714 23.5099 9.05074 23.2376 9.39306 22.8975C9.73533 22.5517 10.0096 22.1446 10.2016 21.6975C10.569 20.8401 10.5979 19.8754 10.2826 18.9975C10.0031 18.2152 9.47184 17.5477 8.77206 17.1C8.41409 16.8691 8.01947 16.7007 7.60506 16.602C7.74549 16.1399 8.02848 15.734 8.41356 15.4425C8.60199 15.301 8.81157 15.1902 9.03456 15.114C9.26505 15.0364 9.50688 14.9979 9.75006 15H14.2501C14.6898 15.0022 15.1263 14.925 15.5386 14.772C15.9393 14.6224 16.312 14.4063 16.6411 14.133C16.9702 13.8581 17.2497 13.5289 17.4676 13.1595C17.6918 12.7794 17.8482 12.3632 17.9296 11.9295C18.3645 11.8551 18.7817 11.6999 19.1596 11.472C19.9019 11.0303 20.4709 10.3481 20.7721 9.53851C20.925 9.12624 21.0023 8.68973 21.0001 8.25001C21.0031 7.74983 20.9009 7.2546 20.7001 6.79651ZM5.87106 5.82451C5.32931 5.59715 4.89842 5.16626 4.67106 4.62451C4.55521 4.34593 4.49556 4.04721 4.49556 3.74551C4.49556 3.4438 4.55521 3.14508 4.67106 2.86651C4.8991 2.32521 5.32976 1.89454 5.87106 1.66651C6.14963 1.55065 6.44836 1.49101 6.75006 1.49101C7.05176 1.49101 7.35049 1.55065 7.62906 1.66651C8.17082 1.89386 8.6017 2.32475 8.82906 2.86651C8.94492 3.14508 9.00456 3.4438 9.00456 3.74551C9.00456 4.04721 8.94492 4.34593 8.82906 4.62451C8.60294 5.16709 8.17164 5.59838 7.62906 5.82451C7.35049 5.94036 7.05176 6.00001 6.75006 6.00001C6.44836 6.00001 6.14963 5.94036 5.87106 5.82451V5.82451ZM7.62906 18.1755C8.17082 18.4029 8.6017 18.8338 8.82906 19.3755C8.94492 19.6541 9.00456 19.9528 9.00456 20.2545C9.00456 20.5562 8.94492 20.8549 8.82906 21.1335C8.60294 21.6761 8.17164 22.1074 7.62906 22.3335C7.35049 22.4494 7.05176 22.509 6.75006 22.509C6.44836 22.509 6.14963 22.4494 5.87106 22.3335C5.32931 22.1061 4.89842 21.6753 4.67106 21.1335C4.55521 20.8549 4.49556 20.5562 4.49556 20.2545C4.49556 19.9528 4.55521 19.6541 4.67106 19.3755C4.8991 18.8342 5.32976 18.4035 5.87106 18.1755C6.14963 18.0596 6.44836 18 6.75006 18C7.05176 18 7.35049 18.0596 7.62906 18.1755V18.1755ZM19.3291 9.12901C19.1029 9.67159 18.6716 10.1029 18.1291 10.329C17.8505 10.4449 17.5518 10.5045 17.2501 10.5045C16.9484 10.5045 16.6496 10.4449 16.3711 10.329C15.8293 10.1016 15.3984 9.67076 15.1711 9.12901C15.0552 8.85043 14.9956 8.55171 14.9956 8.25001C14.9956 7.9483 15.0552 7.64958 15.1711 7.37101C15.3991 6.82971 15.8298 6.39904 16.3711 6.17101C16.6496 6.05515 16.9484 5.99551 17.2501 5.99551C17.5518 5.99551 17.8505 6.05515 18.1291 6.17101C18.6708 6.39836 19.1017 6.82925 19.3291 7.37101C19.4449 7.64958 19.5046 7.9483 19.5046 8.25001C19.5046 8.55171 19.4449 8.85043 19.3291 9.12901V9.12901Z" fill="white"/>
<g clip-path="url(#clip1)">
<path d="M21.7001 6.79651C21.3124 5.90153 20.5985 5.18769 19.7036 4.80001C19.2455 4.59916 18.7502 4.49695 18.2501 4.50001C17.748 4.4974 17.2509 4.59957 16.7906 4.80001C16.3435 4.99198 15.9364 5.26624 15.5906 5.60851C15.2504 5.95083 14.9781 6.35443 14.7881 6.79801C14.5935 7.25714 14.4955 7.75138 14.5001 8.25001C14.4977 8.67564 14.5713 9.09827 14.7176 9.498C14.8594 9.88691 15.0619 10.2509 15.3176 10.5765C15.5726 10.9022 15.8816 11.1817 16.2311 11.403C16.59 11.6308 16.9844 11.7971 17.3981 11.895C17.3285 12.1273 17.2216 12.3466 17.0816 12.5445C16.9452 12.7392 16.7792 12.9113 16.5896 13.0545C16.4011 13.196 16.1916 13.3069 15.9686 13.383C15.7373 13.462 15.4944 13.5015 15.2501 13.5H10.7501C10.3471 13.4992 9.94696 13.5666 9.56656 13.6995C9.18255 13.8326 8.82245 14.0265 8.50006 14.274V7.41751C8.925 7.3351 9.33154 7.17655 9.70006 6.94951C10.0599 6.72813 10.3807 6.44888 10.6496 6.123C10.9168 5.7956 11.1267 5.42539 11.2706 5.02801C11.4219 4.61889 11.4996 4.18621 11.5001 3.75001C11.5031 3.24983 11.4009 2.7546 11.2001 2.29651C10.8124 1.40153 10.0985 0.687688 9.20356 0.300006C8.74547 0.09916 8.25024 -0.00305398 7.75006 5.67945e-06C7.24799 -0.00260461 6.7509 0.0995727 6.29056 0.300006C5.84346 0.491981 5.4364 0.766237 5.09056 1.10851C4.75042 1.45083 4.47813 1.85443 4.28806 2.29801C4.09351 2.75714 3.99548 3.25138 4.00006 3.75001C3.99744 4.61508 4.29602 5.45408 4.84456 6.123C5.11251 6.4492 5.43289 6.72851 5.79256 6.94951C6.16337 7.17739 6.57253 7.33597 7.00006 7.41751V16.5825C6.57253 16.664 6.16337 16.8226 5.79256 17.0505C5.43289 17.2715 5.11251 17.5508 4.84456 17.877C4.29602 18.5459 3.99744 19.3849 4.00006 20.25C3.99715 20.7513 4.09669 21.248 4.29256 21.7095C4.67082 22.6117 5.38834 23.3293 6.29056 23.7075C6.75207 23.9034 7.24872 24.0029 7.75006 24C8.25004 24.001 8.74484 23.8989 9.20356 23.7C9.64714 23.5099 10.0507 23.2376 10.3931 22.8975C10.7353 22.5517 11.0096 22.1446 11.2016 21.6975C11.569 20.8401 11.5979 19.8754 11.2826 18.9975C11.0031 18.2152 10.4718 17.5477 9.77206 17.1C9.41409 16.8691 9.01947 16.7007 8.60506 16.602C8.74549 16.1399 9.02848 15.734 9.41356 15.4425C9.60199 15.301 9.81157 15.1902 10.0346 15.114C10.265 15.0364 10.5069 14.9979 10.7501 15H15.2501C15.6898 15.0022 16.1263 14.925 16.5386 14.772C16.9393 14.6224 17.312 14.4063 17.6411 14.133C17.9702 13.8581 18.2497 13.5289 18.4676 13.1595C18.6918 12.7794 18.8482 12.3632 18.9296 11.9295C19.3645 11.8551 19.7817 11.6999 20.1596 11.472C20.9019 11.0303 21.4709 10.3481 21.7721 9.53851C21.925 9.12624 22.0023 8.68973 22.0001 8.25001C22.0031 7.74983 21.9009 7.2546 21.7001 6.79651ZM6.87106 5.82451C6.32931 5.59715 5.89842 5.16626 5.67106 4.62451C5.55521 4.34593 5.49556 4.04721 5.49556 3.74551C5.49556 3.4438 5.55521 3.14508 5.67106 2.86651C5.8991 2.32521 6.32976 1.89454 6.87106 1.66651C7.14963 1.55065 7.44836 1.49101 7.75006 1.49101C8.05176 1.49101 8.35049 1.55065 8.62906 1.66651C9.17082 1.89386 9.60171 2.32475 9.82906 2.86651C9.94492 3.14508 10.0046 3.4438 10.0046 3.74551C10.0046 4.04721 9.94492 4.34593 9.82906 4.62451C9.60294 5.16709 9.17164 5.59838 8.62906 5.82451C8.35049 5.94036 8.05176 6.00001 7.75006 6.00001C7.44836 6.00001 7.14963 5.94036 6.87106 5.82451ZM8.62906 18.1755C9.17082 18.4029 9.60171 18.8338 9.82906 19.3755C9.94492 19.6541 10.0046 19.9528 10.0046 20.2545C10.0046 20.5562 9.94492 20.8549 9.82906 21.1335C9.60294 21.6761 9.17164 22.1074 8.62906 22.3335C8.35049 22.4494 8.05176 22.509 7.75006 22.509C7.44836 22.509 7.14963 22.4494 6.87106 22.3335C6.32931 22.1061 5.89842 21.6753 5.67106 21.1335C5.55521 20.8549 5.49556 20.5562 5.49556 20.2545C5.49556 19.9528 5.55521 19.6541 5.67106 19.3755C5.8991 18.8342 6.32976 18.4035 6.87106 18.1755C7.14963 18.0596 7.44836 18 7.75006 18C8.05176 18 8.35049 18.0596 8.62906 18.1755ZM20.3291 9.12901C20.1029 9.67159 19.6716 10.1029 19.1291 10.329C18.8505 10.4449 18.5518 10.5045 18.2501 10.5045C17.9484 10.5045 17.6496 10.4449 17.3711 10.329C16.8293 10.1016 16.3984 9.67076 16.1711 9.12901C16.0552 8.85043 15.9956 8.55171 15.9956 8.25001C15.9956 7.9483 16.0552 7.64958 16.1711 7.37101C16.3991 6.82971 16.8298 6.39904 17.3711 6.17101C17.6496 6.05515 17.9484 5.99551 18.2501 5.99551C18.5518 5.99551 18.8505 6.05515 19.1291 6.17101C19.6708 6.39836 20.1017 6.82925 20.3291 7.37101C20.4449 7.64958 20.5046 7.9483 20.5046 8.25001C20.5046 8.55171 20.4449 8.85043 20.3291 9.12901Z" fill="white"/>
</g>
</g>
<defs>
<clipPath id="clip0">
<rect width="24" height="24" fill="white"/>
</clipPath>
<clipPath id="clip1">
<rect width="24" height="24" fill="white" transform="translate(1)"/>
</clipPath>
</defs>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

9
src/vs/workbench/browser/media/images/activitybar/search-alt1.svg
View file

@ -1,3 +1,10 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.5 9C21.5 12.5899 18.5899 15.5 15 15.5C11.4101 15.5 8.5 12.5899 8.5 9C8.5 5.41015 11.4101 2.5 15 2.5C18.5899 2.5 21.5 5.41015 21.5 9ZM23 9C23 13.4183 19.4183 17 15 17C13.1652 17 11.4746 16.3823 10.1249 15.3435L1.67961 23.3533L0.646484 22.2658L9.02478 14.3196C7.7653 12.9059 7 11.0423 7 9C7 4.58172 10.5817 1 15 1C19.4183 1 23 4.58172 23 9ZM1.68879 23L1.69035 22.9985L1.68881 23L1.68879 23Z" fill="white"/>
<g clip-path="url(#clip0)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M22.3958 8.37499C22.3958 12.1144 19.3644 15.1458 15.625 15.1458C11.8856 15.1458 8.85418 12.1144 8.85418 8.37499C8.85418 4.63556 11.8856 1.60416 15.625 1.60416C19.3644 1.60416 22.3958 4.63556 22.3958 8.37499ZM23.9583 8.37499C23.9583 12.9774 20.2274 16.7083 15.625 16.7083C13.7137 16.7083 11.9527 16.0649 10.5468 14.9828L1.7496 23.3263L0.673431 22.1935L9.40082 13.9162C8.08887 12.4436 7.29168 10.5024 7.29168 8.37499C7.29168 3.77262 11.0226 0.0416565 15.625 0.0416565C20.2274 0.0416565 23.9583 3.77262 23.9583 8.37499ZM1.75914 22.9583L1.76184 22.9558L1.75919 22.9583L1.75914 22.9583Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="24" height="24" fill="white"/>
</clipPath>
</defs>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 876 B

5
src/vs/workbench/contrib/search/browser/openFileHandler.ts
View file

@ -117,7 +117,6 @@ export class OpenFileHandler extends QuickOpenHandler {
private cacheState: CacheState;
constructor(
@IEditorService private readonly editorService: IEditorService,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
@ -208,7 +207,7 @@ export class OpenFileHandler extends QuickOpenHandler {
private doResolveQueryOptions(query: IPreparedQuery, cacheKey?: string, maxSortedResults?: number): IFileQueryBuilderOptions {
const queryOptions: IFileQueryBuilderOptions = {
_reason: 'openFileHandler',
extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
extraFileResources: this.instantiationService.invokeFunction(getOutOfWorkspaceEditorResources),
filePattern: query.original,
cacheKey
};
@ -233,7 +232,7 @@ export class OpenFileHandler extends QuickOpenHandler {
private cacheQuery(cacheKey: string): IFileQuery {
const options: IFileQueryBuilderOptions = {
_reason: 'openFileHandler',
extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
extraFileResources: this.instantiationService.invokeFunction(getOutOfWorkspaceEditorResources),
filePattern: '',
cacheKey: cacheKey,
maxResults: 0,

2
src/vs/workbench/contrib/search/browser/searchView.ts
View file

@ -1194,7 +1194,7 @@ export class SearchView extends ViewletPanel {
const options: ITextQueryBuilderOptions = {
_reason: 'searchView',
extraFileResources: getOutOfWorkspaceEditorResources(this.editorService, this.contextService),
extraFileResources: this.instantiationService.invokeFunction(getOutOfWorkspaceEditorResources),
maxResults: SearchView.MAX_TEXT_RESULTS,
disregardIgnoreFiles: !useExcludesAndIgnoreFiles || undefined,
disregardExcludeSettings: !useExcludesAndIgnoreFiles || undefined,

19
src/vs/workbench/contrib/search/common/search.ts
View file

@ -12,6 +12,8 @@ import { URI } from 'vs/base/common/uri';
import { toResource, SideBySideEditor } from 'vs/workbench/common/editor';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { CancellationToken } from 'vs/base/common/cancellation';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { IFileService } from 'vs/platform/files/common/files';
export interface IWorkspaceSymbol {
name: string;
@ -81,15 +83,14 @@ export interface IWorkbenchSearchConfiguration extends ISearchConfiguration {
/**
* Helper to return all opened editors with resources not belonging to the currently opened workspace.
*/
export function getOutOfWorkspaceEditorResources(editorService: IEditorService, contextService: IWorkspaceContextService): URI[] {
const resources: URI[] = [];
export function getOutOfWorkspaceEditorResources(accessor: ServicesAccessor): URI[] {
const editorService = accessor.get(IEditorService);
const contextService = accessor.get(IWorkspaceContextService);
const fileService = accessor.get(IFileService);
editorService.editors.forEach(editor => {
const resource = toResource(editor, { supportSideBySide: SideBySideEditor.MASTER });
if (resource && !contextService.isInsideWorkspace(resource)) {
resources.push(resource);
}
});
const resources = editorService.editors
.map(editor => toResource(editor, { supportSideBySide: SideBySideEditor.MASTER }))
.filter(resource => !!resource && !contextService.isInsideWorkspace(resource) && fileService.canHandleResource(resource));
return resources;
return resources as URI[];
}