Skip to content
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

Jump to bottom

Flips 3wm sides #152754

Merged
merged 3 commits into from
Jun 21, 2022
Merged

Flips 3wm sides #152754

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14f21ac
Adds title property to command.
hediet Jun 21, 2022
467eef9
Sets titles to yours and theirs in the git extension & swaps order. F…
hediet Jun 21, 2022
3530a76
Fixes compilation issues.
hediet Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions extensions/git/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,20 +417,20 @@ export class CommandCenter {
}


type InputData = { uri: Uri; detail?: string; description?: string };
type InputData = { uri: Uri; title?: string; detail?: string; description?: string };
const mergeUris = toMergeUris(uri);
const input1: InputData = { uri: mergeUris.ours };
const input2: InputData = { uri: mergeUris.theirs };
const ours: InputData = { uri: mergeUris.ours, title: localize('Yours', 'Yours') };
const theirs: InputData = { uri: mergeUris.theirs, title: localize('Theirs', 'Theirs') };

try {
const [head, mergeHead] = await Promise.all([repo.getCommit('HEAD'), repo.getCommit('MERGE_HEAD')]);
// ours (current branch and commit)
input1.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
input1.description = head.hash.substring(0, 7);
ours.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
ours.description = head.hash.substring(0, 7);

// theirs
input2.detail = mergeHead.refNames.join(', ');
input2.description = mergeHead.hash.substring(0, 7);
theirs.detail = mergeHead.refNames.join(', ');
theirs.description = mergeHead.hash.substring(0, 7);

} catch (error) {
// not so bad, can continue with just uris
Expand All @@ -440,8 +440,8 @@ export class CommandCenter {

const options = {
ancestor: mergeUris.base,
input1,
input2,
input1: theirs,
input2: ours,
output: uri
};

Expand Down
9 changes: 5 additions & 4 deletions src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,21 @@ namespace IRelaxedOpenArgs {

function toInputResource(obj: unknown): MergeEditorInputData {
if (typeof obj === 'string') {
return new MergeEditorInputData(URI.parse(obj, true), undefined, undefined);
return new MergeEditorInputData(URI.parse(obj, true), undefined, undefined, undefined);
}
if (!obj || typeof obj !== 'object') {
throw new TypeError('invalid argument');
}

if (isUriComponents(obj)) {
return new MergeEditorInputData(URI.revive(obj), undefined, undefined);
return new MergeEditorInputData(URI.revive(obj), undefined, undefined, undefined);
}

const title = (<IRelaxedInputData>obj).title;
const uri = toUri((<IRelaxedInputData>obj).uri);
const detail = (<IRelaxedInputData>obj).detail;
const description = (<IRelaxedInputData>obj).description;
return new MergeEditorInputData(uri, detail, description);
return new MergeEditorInputData(uri, title, detail, description);
}

export function validate(obj: unknown): IOpenEditorArgs {
Expand All @@ -86,7 +87,7 @@ namespace IRelaxedOpenArgs {
}
}

type IRelaxedInputData = { uri: UriComponents; detail?: string; description?: string };
type IRelaxedInputData = { uri: UriComponents; title?: string; detail?: string; description?: string };

type IRelaxedOpenArgs = {
ancestor: UriComponents | string;
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ export class MergeEditorOpenContents extends Action2 {
const input = instaService.createInstance(
MergeEditorInput,
baseUri,
{ uri: input1Uri, description: 'Input 1', detail: '(from JSON)' },
{ uri: input2Uri, description: 'Input 2', detail: '(from JSON)' },
{ uri: input1Uri, title: 'Input 1', description: 'Input 1', detail: '(from JSON)' },
{ uri: input2Uri, title: 'Input 2', description: 'Input 2', detail: '(from JSON)' },
resultUri,
);
editorService.openEditor(input);
Expand Down
7 changes: 5 additions & 2 deletions src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ import { ITextFileEditorModel, ITextFileService } from 'vs/workbench/services/te

export interface MergeEditorInputJSON {
anchestor: URI;
inputOne: { uri: URI; detail?: string; description?: string };
inputTwo: { uri: URI; detail?: string; description?: string };
inputOne: { uri: URI; title?: string; detail?: string; description?: string };
inputTwo: { uri: URI; title?: string; detail?: string; description?: string };
result: URI;
}

export class MergeEditorInputData {
constructor(
readonly uri: URI,
readonly title: string | undefined,
readonly detail: string | undefined,
readonly description: string | undefined,
) { }
Expand Down Expand Up @@ -109,9 +110,11 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput {
MergeEditorModel,
base.object.textEditorModel,
input1.object.textEditorModel,
this._input1.title,
this._input1.detail,
this._input1.description,
input2.object.textEditorModel,
this._input2.title,
this._input2.detail,
this._input2.description,
result.object.textEditorModel
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export class MergeEditorSerializer implements IEditorSerializer {
return instantiationService.createInstance(
MergeEditorInput,
data.anchestor,
new MergeEditorInputData(data.inputOne.uri, data.inputOne.detail, data.inputOne.description),
new MergeEditorInputData(data.inputTwo.uri, data.inputTwo.detail, data.inputTwo.description),
new MergeEditorInputData(data.inputOne.uri, data.inputOne.title, data.inputOne.detail, data.inputOne.description),
new MergeEditorInputData(data.inputTwo.uri, data.inputTwo.title, data.inputTwo.detail, data.inputTwo.description),
data.result
);
} catch (err) {
Expand Down
2 changes: 2 additions & 0 deletions src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,11 @@ export class MergeEditorModel extends EditorModel {
constructor(
readonly base: ITextModel,
readonly input1: ITextModel,
readonly input1Title: string | undefined,
readonly input1Detail: string | undefined,
readonly input1Description: string | undefined,
readonly input2: ITextModel,
readonly input2Title: string | undefined,
readonly input2Detail: string | undefined,
readonly input2Description: string | undefined,
readonly result: ITextModel,
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ export class MergeEditor extends AbstractTextEditor<any> {

const viewModel = new MergeEditorViewModel(model, this.input1View, this.input2View, this.inputResultView);

this.input1View.setModel(viewModel, model.input1, localize('yours', 'Yours'), model.input1Detail, model.input1Description);
this.input2View.setModel(viewModel, model.input2, localize('theirs', 'Theirs',), model.input2Detail, model.input2Description);
this.input1View.setModel(viewModel, model.input1, model.input1Title || localize('input1', 'Input 1'), model.input1Detail, model.input1Description);
this.input2View.setModel(viewModel, model.input2, model.input2Title || localize('input2', 'Input 2',), model.input2Detail, model.input2Description);
this.inputResultView.setModel(viewModel, model.result, localize('result', 'Result',), this._labelService.getUriLabel(model.result.uri, { relative: true }), undefined);
this._ctxBaseResourceScheme.set(model.base.uri.scheme);

Expand Down