conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import * as organizationProjectsPage from '../support/Base/pages/OrganizationProjects.po';
import { OrganizationProjectsPageData } from '../support/Base/pagedata/OrganizationProjectsPageData';
import { CustomCommands } from '../support/commands';
=======
import * as addTaskPage from '../support/Base/pages/AddTasks.po';
import { AddTasksPageData } from '../support/Base/pagedata/AddTasksPageData';
import * as organizationTagsUserPage from '../support/Base/pages/OrganizationTags.po';
import { OrganizationTagsPageData } from '../support/Base/pagedata/OrganizationTagsPageData';
import * as clientsPage from '../support/Base/pages/Clients.po';
import * as faker from 'faker';
import { ClientsData } from '../support/Base/pagedata/ClientsPageData';
let email = ' ';
let fullName = ' ';
let country = ' ';
let city = ' ';
let postcode = ' ';
let street = ' ';
let website = ' ';
>>>>>>>
import * as organizationProjectsPage from '../support/Base/pages/OrganizationProjects.po';
import { OrganizationProjectsPageData } from '../support/Base/pagedata/OrganizationProjectsPageData';
import * as addTaskPage from '../support/Base/pages/AddTasks.po';
import { AddTasksPageData } from '../support/Base/pagedata/AddTasksPageData';
import * as organizationTagsUserPage from '../support/Base/pages/OrganizationTags.po';
import { OrganizationTagsPageData } from '../support/Base/pagedata/OrganizationTagsPageData';
import * as clientsPage from '../support/Base/pages/Clients.po';
import * as faker from 'faker';
import { ClientsData } from '../support/Base/pagedata/ClientsPageData';
import { CustomCommands } from '../support/commands';
let email = ' ';
let fullName = ' ';
let country = ' ';
let city = ' ';
let postcode = ' ';
let street = ' ';
let website = ' ';
<<<<<<<
CustomCommands.login(loginPage, LoginPageData, dashboradPage);
=======
email = faker.internet.email();
fullName = faker.name.firstName() + ' ' + faker.name.lastName();
country = faker.address.country();
city = faker.address.city();
postcode = faker.address.zipCode();
street = faker.address.streetAddress();
website = faker.internet.url();
cy.visit('/');
loginPage.verifyTitle();
loginPage.verifyLoginText();
loginPage.clearEmailField();
loginPage.enterEmail(LoginPageData.email);
loginPage.clearPasswordField();
loginPage.enterPassword(LoginPageData.password);
loginPage.clickLoginButton();
dashboradPage.verifyCreateButton();
>>>>>>>
email = faker.internet.email();
fullName = faker.name.firstName() + ' ' + faker.name.lastName();
country = faker.address.country();
city = faker.address.city();
postcode = faker.address.zipCode();
street = faker.address.streetAddress();
website = faker.internet.url();
CustomCommands.login(loginPage, LoginPageData, dashboradPage);
<<<<<<<
=======
addTaskPage.clickSelectEmployeeDropdown();
addTaskPage.selectEmployeeDropdownOption(1);
addTaskPage.selectEmployeeDropdownOption(2);
addTaskPage.clickKeyboardButtonByKeyCode(9);
addTaskPage.saveProjectButtonVisible();
addTaskPage.clickSaveProjectButton();
cy.visit('/#/pages/organization/tags');
organizationTagsUserPage.gridButtonVisible();
organizationTagsUserPage.clickGridButton(1);
organizationTagsUserPage.addTagButtonVisible();
organizationTagsUserPage.clickAddTagButton();
organizationTagsUserPage.tagNameInputVisible();
organizationTagsUserPage.enterTagNameData(
OrganizationTagsPageData.tageName
);
organizationTagsUserPage.tagColorInputVisible();
organizationTagsUserPage.enterTagColorData(
OrganizationTagsPageData.tagColor
);
organizationTagsUserPage.tagDescriptionTextareaVisible();
organizationTagsUserPage.enterTagDescriptionData(
OrganizationTagsPageData.tagDescription
);
organizationTagsUserPage.saveTagButtonVisible();
organizationTagsUserPage.clickSaveTagButton();
cy.visit('/#/pages/contacts/clients');
clientsPage.gridBtnExists();
clientsPage.gridBtnClick(1);
clientsPage.addButtonVisible();
clientsPage.clickAddButton();
clientsPage.nameInputVisible();
clientsPage.enterNameInputData(fullName);
clientsPage.emailInputVisible();
clientsPage.enterEmailInputData(email);
clientsPage.phoneInputVisible();
clientsPage.enterPhoneInputData(ClientsData.defaultPhone);
clientsPage.countryInputVisible();
clientsPage.enterCountryInputData(country);
clientsPage.cityInputVisible();
clientsPage.enterCityInputData(city);
clientsPage.postcodeInputVisible();
clientsPage.enterPostcodeInputData(postcode);
clientsPage.streetInputVisible();
clientsPage.enterStreetInputData(street);
clientsPage.projectDropdownVisible();
clientsPage.clickProjectDropdown();
clientsPage.selectProjectFromDropdown(ClientsData.defaultProject);
clientsPage.selectEmployeeDropdownVisible();
clientsPage.clickSelectEmployeeDropdown();
clientsPage.selectEmployeeDropdownOption(0);
clientsPage.clickKeyboardButtonByKeyCode(9);
clientsPage.tagsMultyselectVisible();
clientsPage.clickTagsMultyselect();
clientsPage.selectTagsFromDropdown(0);
clientsPage.clickCardBody();
clientsPage.websiteInputVisible();
clientsPage.enterWebsiteInputData(website);
clientsPage.saveButtonVisible();
clientsPage.clickSaveButton();
cy.visit('/#/pages/tasks/dashboard');
addTaskPage.gridBtnExists();
addTaskPage.gridBtnClick(1);
addTaskPage.addTaskButtonVisible();
addTaskPage.clickAddTaskButton();
addTaskPage.selectProjectDropdownVisible();
addTaskPage.clickSelectProjectDropdown();
addTaskPage.selectProjectOptionDropdown(
AddTasksPageData.defaultTaskProject
);
addTaskPage.selectEmployeeDropdownVisible();
addTaskPage.clickSelectEmployeeDropdown();
addTaskPage.selectEmployeeDropdownOption(1);
addTaskPage.selectEmployeeDropdownOption(2);
addTaskPage.clickKeyboardButtonByKeyCode(9);
addTaskPage.addTitleInputVisible();
addTaskPage.enterTtielInputData(AddTasksPageData.defaultTaskTitle);
addTaskPage.dueDateInputVisible();
addTaskPage.enterDueDateData();
addTaskPage.clickKeyboardButtonByKeyCode(9);
addTaskPage.estimateDaysInputVisible();
addTaskPage.enterEstiamteDaysInputData(
AddTasksPageData.defaultTaskEstimateDays
);
addTaskPage.estimateHoursInputVisible();
addTaskPage.enterEstiamteHoursInputData(
AddTasksPageData.defaultTaskEstimateHours
);
addTaskPage.estimateMinutesInputVisible();
addTaskPage.enterEstimateMinutesInputData(
AddTasksPageData.defaultTaskEstimateMinutes
);
addTaskPage.taskDecriptionTextareaVisible();
addTaskPage.enterTaskDescriptionTextareaData(
AddTasksPageData.defaultTaskDescription
);
addTaskPage.saveTaskButtonVisible();
addTaskPage.clickSaveTaskButton();
>>>>>>>
CustomCommands.addTag(
organizationTagsUserPage,
OrganizationTagsPageData
);
cy.visit('/#/pages/contacts/clients');
clientsPage.gridBtnExists();
clientsPage.gridBtnClick(1);
clientsPage.addButtonVisible();
clientsPage.clickAddButton();
clientsPage.nameInputVisible();
clientsPage.enterNameInputData(fullName);
clientsPage.emailInputVisible();
clientsPage.enterEmailInputData(email);
clientsPage.phoneInputVisible();
clientsPage.enterPhoneInputData(ClientsData.defaultPhone);
clientsPage.countryInputVisible();
clientsPage.enterCountryInputData(country);
clientsPage.cityInputVisible();
clientsPage.enterCityInputData(city);
clientsPage.postcodeInputVisible();
clientsPage.enterPostcodeInputData(postcode);
clientsPage.streetInputVisible();
clientsPage.enterStreetInputData(street);
clientsPage.projectDropdownVisible();
clientsPage.clickProjectDropdown();
clientsPage.selectProjectFromDropdown(ClientsData.defaultProject);
clientsPage.selectEmployeeDropdownVisible();
clientsPage.clickSelectEmployeeDropdown();
clientsPage.selectEmployeeDropdownOption(0);
clientsPage.clickKeyboardButtonByKeyCode(9);
clientsPage.tagsMultyselectVisible();
clientsPage.clickTagsMultyselect();
clientsPage.selectTagsFromDropdown(0);
clientsPage.clickCardBody();
clientsPage.websiteInputVisible();
clientsPage.enterWebsiteInputData(website);
clientsPage.saveButtonVisible();
clientsPage.clickSaveButton();
cy.visit('/#/pages/tasks/dashboard');
addTaskPage.gridBtnExists();
addTaskPage.gridBtnClick(1);
addTaskPage.addTaskButtonVisible();
addTaskPage.clickAddTaskButton();
addTaskPage.selectProjectDropdownVisible();
addTaskPage.clickSelectProjectDropdown();
addTaskPage.selectProjectOptionDropdown(
AddTasksPageData.defaultTaskProject
);
addTaskPage.selectEmployeeDropdownVisible();
addTaskPage.clickSelectEmployeeDropdown();
addTaskPage.selectEmployeeDropdownOption(1);
addTaskPage.selectEmployeeDropdownOption(2);
addTaskPage.clickKeyboardButtonByKeyCode(9);
addTaskPage.addTitleInputVisible();
addTaskPage.enterTtielInputData(AddTasksPageData.defaultTaskTitle);
addTaskPage.dueDateInputVisible();
addTaskPage.enterDueDateData();
addTaskPage.clickKeyboardButtonByKeyCode(9);
addTaskPage.estimateDaysInputVisible();
addTaskPage.enterEstiamteDaysInputData(
AddTasksPageData.defaultTaskEstimateDays
);
addTaskPage.estimateHoursInputVisible();
addTaskPage.enterEstiamteHoursInputData(
AddTasksPageData.defaultTaskEstimateHours
);
addTaskPage.estimateMinutesInputVisible();
addTaskPage.enterEstimateMinutesInputData(
AddTasksPageData.defaultTaskEstimateMinutes
);
addTaskPage.taskDecriptionTextareaVisible();
addTaskPage.enterTaskDescriptionTextareaData(
AddTasksPageData.defaultTaskDescription
);
addTaskPage.saveTaskButtonVisible();
addTaskPage.clickSaveTaskButton(); |
<<<<<<<
=======
import { EditOrganizationDepartmentsMutationComponent } from './edit-organization-departments/edit-organization-departments-mutation/edit-organization-departments-mutation.component';
import { EntityWithMembersModule } from 'apps/gauzy/src/app/@shared/entity-with-members-card/entity-with-members-card.module';
import { EmployeeMultiSelectModule } from 'apps/gauzy/src/app/@shared/employee/employee-multi-select/employee-multi-select.module';
import { EditOrganizationClientMutationComponent } from './edit-organization-clients/edit-organization-clients-mutation/edit-organization-clients-mutation.component';
import { EditOrganizationProjectsMutationComponent } from './edit-organization-projects/edit-organization-projects-mutation/edit-organization-projects-mutation.component';
import { EmployeeStore } from 'apps/gauzy/src/app/@core/services/employee-store.service';
import { InviteClientComponent } from './edit-organization-clients/invite-client/invite-client.component';
import { EditOrganizationEmploymentTypes } from './edit-organization-employment-types/edit-organization-employment-types.component';
>>>>>>>
import { EditOrganizationEmploymentTypes } from './edit-organization-employment-types/edit-organization-employment-types.component'; |
<<<<<<<
import { EmployeeLevelService } from 'apps/gauzy/src/app/@core/services/employee-level.service';
=======
import { OrganizationDepartmentsService } from 'apps/gauzy/src/app/@core/services/organization-departments.service';
import { OrganizationPositionsService } from 'apps/gauzy/src/app/@core/services/organization-positions';
import { Store } from 'apps/gauzy/src/app/@core/services/store.service';
>>>>>>>
import { EmployeeLevelService } from 'apps/gauzy/src/app/@core/services/employee-level.service';
import { OrganizationDepartmentsService } from 'apps/gauzy/src/app/@core/services/organization-departments.service';
import { OrganizationPositionsService } from 'apps/gauzy/src/app/@core/services/organization-positions';
import { Store } from 'apps/gauzy/src/app/@core/services/store.service';
<<<<<<<
fakeDepartments: { departmentName: string; departmentId: string }[] = [];
fakePositions: { positionName: string; positionId: string }[] = [];
employeeLevels: { level: string; organizationId: string }[] = [];
=======
selectedOrganization: Organization;
departments: OrganizationDepartment[] = [];
positions: OrganizationPositions[] = [];
>>>>>>>
fakeDepartments: { departmentName: string; departmentId: string }[] = [];
fakePositions: { positionName: string; positionId: string }[] = [];
employeeLevels: { level: string; organizationId: string }[] = [];
selectedOrganization: Organization;
departments: OrganizationDepartment[] = [];
positions: OrganizationPositions[] = [];
<<<<<<<
private employeeStore: EmployeeStore,
private employeeLevelService: EmployeeLevelService
=======
private employeeStore: EmployeeStore,
private readonly organizationDepartmentsService: OrganizationDepartmentsService,
private readonly organizationPositionsService: OrganizationPositionsService
>>>>>>>
private readonly employeeStore: EmployeeStore,
private readonly employeeLevelService: EmployeeLevelService,
private readonly organizationDepartmentsService: OrganizationDepartmentsService,
private readonly organizationPositionsService: OrganizationPositionsService
<<<<<<<
this.employeeLevelService
.getAll()
.pipe(takeUntil(this._ngDestroy$))
.subscribe((data) => {
this.employeeLevels = data['items'];
});
this.getFakeData();
=======
this.store.selectedOrganization$
.pipe(takeUntil(this._ngDestroy$))
.subscribe((organization) => {
this.selectedOrganization = organization;
if (this.selectedOrganization) {
this.getPositions();
}
});
>>>>>>>
this.employeeLevelService
.getAll()
.pipe(takeUntil(this._ngDestroy$))
.subscribe((data) => {
this.employeeLevels = data['items'];
});
this.getFakeData();
this.store.selectedOrganization$
.pipe(takeUntil(this._ngDestroy$))
.subscribe((organization) => {
this.selectedOrganization = organization;
if (this.selectedOrganization) {
this.getPositions();
}
});
<<<<<<<
imageUrl: [employee.user.imageUrl, Validators.required],
employeeLevel: [
employee.user.employeeLevel || '',
Validators.required
]
=======
imageUrl: [employee.user.imageUrl, Validators.required],
organizationDepartment: [employee.organizationDepartment || null],
organizationPosition: [employee.organizationPosition || null]
>>>>>>>
imageUrl: [employee.user.imageUrl, Validators.required],
employeeLevel: [
employee.user.employeeLevel || '',
Validators.required
],
organizationDepartment: [employee.organizationDepartment || null],
organizationPosition: [employee.organizationPosition || null] |
<<<<<<<
import { CandidateSourceModule } from './candidate-source/candidate-source.module';
=======
import { CandidateSourceModule } from './candidate_source/candidate_source.module';
import { CandidateDocumentsModule } from './candidate-documents/candidate-documents.module';
>>>>>>>
import { CandidateSourceModule } from './candidate-source/candidate-source.module';
import { CandidateDocumentsModule } from './candidate-documents/candidate-documents.module'; |
<<<<<<<
import {EntityManager} from "../../entity-manager/EntityManager";
=======
import {OrmUtils} from "../../util/OrmUtils";
>>>>>>>
import {OrmUtils} from "../../util/OrmUtils";
<<<<<<<
import {PromiseUtils} from "../../util/PromiseUtils";
import {Broadcaster} from "../../subscriber/Broadcaster";
=======
import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions";
import {TableUnique} from "../../schema-builder/table/TableUnique";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
>>>>>>>
import {TableIndexOptions} from "../../schema-builder/options/TableIndexOptions";
import {TableUnique} from "../../schema-builder/table/TableUnique";
import {TableCheck} from "../../schema-builder/table/TableCheck";
import {BaseQueryRunner} from "../../query-runner/BaseQueryRunner";
import {Broadcaster} from "../../subscriber/Broadcaster";
<<<<<<<
/**
* Connection used by this query runner.
*/
connection: Connection;
/**
* Broadcaster used on this query runner to broadcast entity events.
*/
broadcaster: Broadcaster;
/**
* Isolated entity manager working only with current query runner.
*/
manager: EntityManager;
/**
* Indicates if connection for this query runner is released.
* Once its released, query runner cannot run queries anymore.
*/
isReleased = false;
/**
* Indicates if transaction is in progress.
*/
isTransactionActive = false;
/**
* Stores temporarily user data.
* Useful for sharing data with subscribers.
*/
data = {};
=======
>>>>>>>
/**
* Broadcaster used on this query runner to broadcast entity events.
*/
broadcaster: Broadcaster;
<<<<<<<
=======
* Insert a new row with given values into the given table.
* Returns value of the generated column if given and generate column exist in the table.
*/
async insert(tablePath: string, keyValues: ObjectLiteral): Promise<any> {
const keys = Object.keys(keyValues);
const columns = keys.map(key => `"${key}"`).join(", ");
const values = keys.map((key, index) => "@" + index).join(",");
const generatedColumns = this.connection.hasMetadata(tablePath) ? this.connection.getMetadata(tablePath).generatedColumns : [];
const generatedColumnNames = generatedColumns.map(generatedColumn => `INSERTED."${generatedColumn.databaseName}"`).join(", ");
const generatedColumnSql = generatedColumns.length > 0 ? ` OUTPUT ${generatedColumnNames}` : "";
const sql = columns.length > 0
? `INSERT INTO ${this.escapeTableName(tablePath)}(${columns}) ${generatedColumnSql} VALUES (${values})`
: `INSERT INTO ${this.escapeTableName(tablePath)} ${generatedColumnSql} DEFAULT VALUES `;
const parameters = this.driver.parametrizeMap(tablePath, keyValues);
const parametersArray = Object.keys(parameters).map(key => parameters[key]);
const result = await this.query(sql, parametersArray);
const generatedMap = generatedColumns.reduce((map, column) => {
const valueMap = column.createValueMap(result[0][column.databaseName]);
return OrmUtils.mergeDeep(map, valueMap);
}, {} as ObjectLiteral);
return {
result: result,
generatedMap: Object.keys(generatedMap).length > 0 ? generatedMap : undefined
};
}
/**
* Updates rows that match given conditions in the given table.
*/
async update(tablePath: string, valuesMap: ObjectLiteral, conditions: ObjectLiteral): Promise<void> {
valuesMap = this.driver.parametrizeMap(tablePath, valuesMap);
conditions = this.driver.parametrizeMap(tablePath, conditions);
const conditionParams = Object.keys(conditions).map(key => conditions[key]);
const updateParams = Object.keys(valuesMap).map(key => valuesMap[key]);
const allParameters = updateParams.concat(conditionParams);
const updateValues = this.parametrize(valuesMap).join(", ");
const conditionString = this.parametrize(conditions, updateParams.length).join(" AND ");
const sql = `UPDATE ${this.escapeTableName(tablePath)} SET ${updateValues} ${conditionString ? (" WHERE " + conditionString) : ""}`;
await this.query(sql, allParameters);
}
/**
* Deletes from the given table by a given conditions.
*/
async delete(tablePath: string, conditions: ObjectLiteral|string, maybeParameters?: any[]): Promise<void> {
conditions = typeof conditions === "object" ? this.driver.parametrizeMap(tablePath, conditions) : conditions;
const conditionString = typeof conditions === "string" ? conditions : this.parametrize(conditions).join(" AND ");
const parameters = conditions instanceof Object ? Object.keys(conditions).map(key => (conditions as ObjectLiteral)[key]) : maybeParameters;
const sql = `DELETE FROM ${this.escapeTableName(tablePath)} WHERE ${conditionString}`;
await this.query(sql, parameters);
}
/**
>>>>>>> |
<<<<<<<
import { DynamicModulesComponent } from './dynamic-modules/dynamic-modules.component';
import { LifecycleEventsComponent } from './lifecycle-events/lifecycle-events.component';
import { ModuleRefComponent } from './module-reference/module-reference.component';
=======
import { DynamicModulesComponent } from './dynamic-modules/dynamic-modules.component';
import { ExecutionContextComponent } from './execution-context/execution-context.component';
import { LifecycleEventsComponent } from './lifecycle-events/lifecycle-events.component';
>>>>>>>
import { DynamicModulesComponent } from './dynamic-modules/dynamic-modules.component';
import { LifecycleEventsComponent } from './lifecycle-events/lifecycle-events.component';
import { ModuleRefComponent } from './module-reference/module-reference.component';
import { ExecutionContextComponent } from './execution-context/execution-context.component'; |
<<<<<<<
protected handleAttach() {
=======
private handleAttach() {
if (!this.object) return
>>>>>>>
protected handleAttach() {
if (!this.object) return |
<<<<<<<
import {OutputVerifier, PatternToFailure} from "../../common/outputVerifier";
=======
import {DeviceHelper, IDevice} from "../../common/android/deviceHelper";
>>>>>>>
import {OutputVerifier, PatternToFailure} from "../../common/outputVerifier";
import {DeviceHelper, IDevice} from "../../common/android/deviceHelper";
<<<<<<<
public runApp(runOptions: IRunOptions): Q.Promise<void> {
const runAndroidSpawn = new CommandExecutor(runOptions.projectRoot).spawnChildReactCommandProcess("run-android");
return new OutputVerifier(
() =>
Q(AndroidPlatform.RUN_ANDROID_SUCCESS_PATTERNS),
() =>
Q(AndroidPlatform.RUN_ANDROID_FAILURE_PATTERNS)).process(runAndroidSpawn);
=======
private debugTarget: string;
private packageName: string;
private deviceHelper: DeviceHelper;
constructor() {
this.deviceHelper = new DeviceHelper();
>>>>>>>
private debugTarget: string;
private packageName: string;
private deviceHelper: DeviceHelper;
constructor() {
this.deviceHelper = new DeviceHelper(); |
<<<<<<<
import {OutputChannel} from "vscode";
=======
enum LogLevel {
None = 0,
Error = 1,
Warning = 2,
Debug = 3,
Trace = 4
}
>>>>>>>
import {OutputChannel} from "vscode";
enum LogLevel {
None = 0,
Error = 1,
Warning = 2,
Debug = 3,
Trace = 4
} |
<<<<<<<
import {ChildProcess} from "child_process";
import {CommandExecutor} from "../utils/commands/commandExecutor";
import {Log} from "../utils/commands/log";
import {OutputChannel} from "vscode";
import {PlatformResolver} from "./platformResolver";
=======
import {IDesktopPlatform} from "./platformResolver";
>>>>>>>
import {ChildProcess} from "child_process";
import {CommandExecutor} from "../utils/commands/commandExecutor";
import {IDesktopPlatform} from "./platformResolver";
import {Log} from "../utils/commands/log";
import {Node} from "../utils/node/node";
import {OutputChannel} from "vscode";
import {PlatformResolver} from "./platformResolver";
<<<<<<<
=======
import {CommandExecutor} from "../utils/commands/commandExecutor";
import {Log} from "../utils/commands/log";
import {Node} from "../utils/node/node";
>>>>>>>
<<<<<<<
private packagerProcess: ChildProcess;
=======
private sourcesStoragePath: string;
private desktopPlatform: IDesktopPlatform;
>>>>>>>
private packagerProcess: ChildProcess;
private sourcesStoragePath: string;
private desktopPlatform: IDesktopPlatform;
<<<<<<<
let args = mandatoryArgs.concat(desktopPlatform.reactPackagerExtraParameters);
let childEnvForDebugging = Object.assign({}, process.env, { REACT_DEBUGGER: "echo A debugger is not needed: " });
=======
let args = mandatoryArgs.concat(this.desktopPlatform.reactPackagerExtraParameters);
let childEnv = Object.assign({}, process.env, { REACT_DEBUGGER: "echo A debugger is not needed: " });
>>>>>>>
let args = mandatoryArgs.concat(this.desktopPlatform.reactPackagerExtraParameters);
let childEnvForDebugging = Object.assign({}, process.env, { REACT_DEBUGGER: "echo A debugger is not needed: " });
<<<<<<<
let spawnOptions = skipDebuggerEnvSetup ? {} : { env: childEnvForDebugging };
new CommandExecutor(this.projectPath).spawn(desktopPlatform.reactNativeCommandName, args, spawnOptions).then((packagerProcess) => {
this.packagerProcess = packagerProcess;
}).done();
=======
new CommandExecutor(this.projectPath).spawn(this.desktopPlatform.reactNativeCommandName, args, { env: childEnv }).done();
>>>>>>>
let spawnOptions = skipDebuggerEnvSetup ? {} : { env: childEnvForDebugging };
new CommandExecutor(this.projectPath).spawn(this.desktopPlatform.reactNativeCommandName, args, spawnOptions).then((packagerProcess) => {
this.packagerProcess = packagerProcess;
}).done();
<<<<<<<
Log.logMessage("Packager started.", outputChannel);
=======
Log.logMessage("Packager started.");
return this.downloadDebuggerWorker();
}).then(() => {
Log.logMessage("Downloaded debuggerWorker.js (Logic to run the React Native app) from the Packager.");
>>>>>>>
Log.logMessage("Packager started.", outputChannel);
return this.downloadDebuggerWorker();
}).then(() => {
Log.logMessage("Downloaded debuggerWorker.js (Logic to run the React Native app) from the Packager."); |
<<<<<<<
import {SqlServerDriver} from "../driver/sqlserver/SqlServerDriver";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {PromiseUtils} from "../util/PromiseUtils";
import {SqljsEntityManager} from "../entity-manager/SqljsEntityManager";
=======
>>>>>>>
import {SqljsEntityManager} from "../entity-manager/SqljsEntityManager"; |
<<<<<<<
getUserID(): string;
=======
isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean;
>>>>>>>
getUserID(): string;
isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean;
<<<<<<<
public getUserID(): string {
return process.env.USERNAME;
}
=======
public isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return targetPlatformId === TargetPlatformId.ANDROID;
}
>>>>>>>
public getUserID(): string {
return process.env.USERNAME;
}
public isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return targetPlatformId === TargetPlatformId.ANDROID;
}
<<<<<<<
public abstract getUserID(): string;
=======
public abstract isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean;
>>>>>>>
public abstract getUserID(): string;
public abstract isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean;
<<<<<<<
public getUserID(): string {
return process.env.LOGNAME;
}
=======
public isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return targetPlatformId === TargetPlatformId.ANDROID || targetPlatformId === TargetPlatformId.IOS;
}
>>>>>>>
public getUserID(): string {
return process.env.LOGNAME;
}
public isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return targetPlatformId === TargetPlatformId.ANDROID || targetPlatformId === TargetPlatformId.IOS;
}
<<<<<<<
public getUserID(): string {
return process.env.USER;
}
=======
public isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return targetPlatformId === TargetPlatformId.ANDROID;
}
>>>>>>>
public getUserID(): string {
return process.env.USER;
}
public isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return targetPlatformId === TargetPlatformId.ANDROID;
}
<<<<<<<
/* Returns a value that is unique for each user of this computer */
public static getUserID(): string {
return HostPlatform.platform.getUserID();
}
=======
public static isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return HostPlatform.platform.isCompatibleWithTarget(targetPlatformId);
}
>>>>>>>
/* Returns a value that is unique for each user of this computer */
public static getUserID(): string {
return HostPlatform.platform.getUserID();
}
public static isCompatibleWithTarget(targetPlatformId: TargetPlatformId): boolean {
return HostPlatform.platform.isCompatibleWithTarget(targetPlatformId);
} |
<<<<<<<
// Validating user input errors
ExpectedIntegerValue = 1001,
=======
// Inter Process Communication errors
ErrorWhileProcessingMessageInIPMSServer = 901,
>>>>>>>
// Validating user input errors
ExpectedIntegerValue = 1001,
// Inter Process Communication errors
ErrorWhileProcessingMessageInIPMSServer = 901, |
<<<<<<<
import {IRunOptions} from "../common/launchArgs";
import * as em from "../common/extensionMessaging";
=======
import {EntryPointHandler} from "../common/entryPointHandler";
import {IRunOptions} from "./launchArgs";
>>>>>>>
import {IRunOptions} from "../common/launchArgs";
import * as em from "../common/extensionMessaging";
import {EntryPointHandler} from "../common/entryPointHandler";
<<<<<<<
public launch() {
let version = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "..", "package.json"), "utf-8")).version;
let extensionMessageSender = new em.ExtensionMessageSender();
=======
public launch(): void {
>>>>>>>
public launch(): void { |
<<<<<<<
import {ConfigurationReader} from "../common/configurationReader";
import {SettingsHelper} from "./settingsHelper";
=======
import {Telemetry} from "../common/telemetry";
>>>>>>>
import {ConfigurationReader} from "../common/configurationReader";
import {SettingsHelper} from "./settingsHelper";
import {Telemetry} from "../common/telemetry";
<<<<<<<
this.messageHandlerDictionary[em.ExtensionMessage.GET_PACKAGER_PORT] = this.getPackagerPort;
=======
this.messageHandlerDictionary[em.ExtensionMessage.SEND_TELEMETRY] = this.sendTelemetry;
>>>>>>>
this.messageHandlerDictionary[em.ExtensionMessage.GET_PACKAGER_PORT] = this.getPackagerPort;
this.messageHandlerDictionary[em.ExtensionMessage.SEND_TELEMETRY] = this.sendTelemetry; |
<<<<<<<
public setMainFile(value: string): Q.Promise<void> {
return this.parsePackageInformation()
.then(packageInformation => {
packageInformation.main = value;
return new Node.FileSystem().writeFile(this.informationJsonFilePath(), JSON.stringify(<Object>packageInformation));
});
}
=======
private informationJsonFilePath(): string {
return pathModule.resolve(this._path, this.INFORMATION_PACKAGE_FILENAME);
}
>>>>>>>
public setMainFile(value: string): Q.Promise<void> {
return this.parsePackageInformation()
.then(packageInformation => {
packageInformation.main = value;
return new Node.FileSystem().writeFile(this.informationJsonFilePath(), JSON.stringify(<Object>packageInformation));
});
}
private informationJsonFilePath(): string {
return pathModule.resolve(this._path, this.INFORMATION_PACKAGE_FILENAME);
} |
<<<<<<<
import {IntellisenseHelper} from "./IntellisenseHelper";
import {TelemetryHelper} from "../common/TelemetryHelper";
import {EntryPoint} from "../common/entryPoint";
=======
import {IntellisenseHelper} from "./intellisenseHelper";
import {Telemetry} from "../common/telemetry";
import {TelemetryHelper} from "../common/telemetryHelper";
>>>>>>>
import {IntellisenseHelper} from "./intellisenseHelper";
import {TelemetryHelper} from "../common/telemetryHelper"; |
<<<<<<<
import 'p2';
import 'pixi';
import 'phaser';
import Label from './Label';
import {Atlases, Constants} from '../../Data';
export default class LabeledButton extends Phaser.Button {
protected id: string;
protected label: Label;
protected maxWidth: number;
protected maxHeight: number;
constructor(game: Phaser.Game, x: number, y: number, text: string, textStyle: any, callback: Function, callbackContext: any, maxWidth?: number, maxHeight?: number) {
super(game, x, y, Atlases.Interface, callback, callbackContext);
this.anchor.set(0.5);
this.maxWidth = maxWidth ? maxWidth : this.width;
this.maxHeight = maxHeight ? maxHeight : this.height;
this.label = new Label(this.game, 0, 2 * Constants.GAME_SCALE, text, textStyle, this.maxWidth, this.maxHeight);
this.label.anchor.set(0.5);
this.addChild(this.label);
this.game.add.existing(this);
}
/**
* Create easily a texture with graphics.
* @param bgColor
*/
public createTexture(bgColor: number): void {
//Create a texture with shadow and use it as the texture of the button.
let graphics: Phaser.Graphics = this.game.make.graphics(0, 0);
graphics.beginFill(0x000000, 0.3)
.drawRoundedRect(5, 5 * Constants.GAME_SCALE, this.maxWidth - 10 * Constants.GAME_SCALE, this.maxHeight, 15 * Constants.GAME_SCALE)
.beginFill(bgColor)
.drawRoundedRect(0, 0, this.maxWidth, this.maxHeight, 15 * Constants.GAME_SCALE)
.lineStyle(3, 0xffffff)
.drawRoundedRect(0, 0, this.maxWidth - 2, this.maxHeight - 2, 15 * Constants.GAME_SCALE)
.endFill();
this.texture = graphics.generateTexture();
graphics.destroy(true);
}
/**
* Call the setText function of the button's label.
*/
public setText(text: string): void {
this.label.setText(text);
}
public updateScaling(scale: number): void {
this.scale.set(scale);
this.label.setMaxSize(this.width * 0.90, this.height * 0.98);
this.label.setText(this.label.text);
}
/**
* Override destroy function so it also destroys the label attached to the button.
* @param destroyChildren
*/
public destroy(destroyChildren?: boolean): void {
this.label.destroy(destroyChildren);
this.id = null;
this.label = null;
super.destroy(destroyChildren);
=======
module BoilerPlate {
export class LabeledButton extends Phaser.Button {
protected id: string;
protected label: Label;
protected maxWidth: number;
protected maxHeight: number;
constructor(game: Phaser.Game, x: number, y: number, text: string, textStyle: any, callback: Function, callbackContext: any, maxWidth?: number, maxHeight?: number) {
super(game, x, y, Atlases.Interface, callback, callbackContext);
this.anchor.set(0.5);
this.maxWidth = maxWidth ? maxWidth : this.width;
this.maxHeight = maxHeight ? maxHeight : this.height;
this.label = new Label(this.game, 0, 2 * Constants.GAME_SCALE, text, textStyle, this.maxWidth, this.maxHeight);
this.label.anchor.set(0.5);
this.addChild(this.label);
this.onInputUp.add(this.playSound, this);
this.game.add.existing(this);
}
/**
* Create easily a texture with graphics.
* @param bgColor
*/
public createTexture(bgColor: number): void {
//Create a texture with shadow and use it as the texture of the button.
let graphics: Phaser.Graphics = this.game.make.graphics(0, 0);
graphics.beginFill(0x000000, 0.3)
.drawRoundedRect(5, 5 * Constants.GAME_SCALE, this.maxWidth - 10 * Constants.GAME_SCALE, this.maxHeight, 15 * Constants.GAME_SCALE)
.beginFill(bgColor)
.drawRoundedRect(0, 0, this.maxWidth, this.maxHeight, 15 * Constants.GAME_SCALE)
.lineStyle(3, 0xffffff)
.drawRoundedRect(0, 0, this.maxWidth - 2, this.maxHeight - 2, 15 * Constants.GAME_SCALE)
.endFill();
this.texture = graphics.generateTexture();
graphics.destroy(true);
}
/**
* Call the setText function of the button's label.
*/
public setText(text: string): void {
this.label.setText(text);
}
/**
* Updates the scaling until the text fits the given size.
* @param {number} scale
*/
public updateScaling(scale: number): void {
this.scale.set(scale);
this.label.setMaxSize(this.width * 0.90, this.height * 0.98);
this.label.setText(this.label.text);
}
/**
* Override destroy function so it also destroys the label attached to the button.
* @param destroyChildren
*/
public destroy(destroyChildren?: boolean): void {
this.label.destroy(destroyChildren);
this.id = null;
this.label = null;
super.destroy(destroyChildren);
}
/**
* Play click sound every time the button is released.
* @param destroyChildren
*/
private playSound(): void {
SoundManager.getInstance().play(Sounds.Click);
}
>>>>>>>
import 'p2';
import 'pixi';
import 'phaser';
import Label from './Label';
import {Atlases, Constants} from '../../Data';
export default class LabeledButton extends Phaser.Button {
protected id: string;
protected label: Label;
protected maxWidth: number;
protected maxHeight: number;
constructor(game: Phaser.Game, x: number, y: number, text: string, textStyle: any, callback: Function, callbackContext: any, maxWidth?: number, maxHeight?: number) {
super(game, x, y, Atlases.Interface, callback, callbackContext);
this.anchor.set(0.5);
this.maxWidth = maxWidth ? maxWidth : this.width;
this.maxHeight = maxHeight ? maxHeight : this.height;
this.label = new Label(this.game, 0, 2 * Constants.GAME_SCALE, text, textStyle, this.maxWidth, this.maxHeight);
this.label.anchor.set(0.5);
this.addChild(this.label);
this.onInputUp.add(this.playSound, this);
this.game.add.existing(this);
}
/**
* Create easily a texture with graphics.
* @param bgColor
*/
public createTexture(bgColor: number): void {
//Create a texture with shadow and use it as the texture of the button.
let graphics: Phaser.Graphics = this.game.make.graphics(0, 0);
graphics.beginFill(0x000000, 0.3)
.drawRoundedRect(5, 5 * Constants.GAME_SCALE, this.maxWidth - 10 * Constants.GAME_SCALE, this.maxHeight, 15 * Constants.GAME_SCALE)
.beginFill(bgColor)
.drawRoundedRect(0, 0, this.maxWidth, this.maxHeight, 15 * Constants.GAME_SCALE)
.lineStyle(3, 0xffffff)
.drawRoundedRect(0, 0, this.maxWidth - 2, this.maxHeight - 2, 15 * Constants.GAME_SCALE)
.endFill();
this.texture = graphics.generateTexture();
graphics.destroy(true);
}
/**
* Call the setText function of the button's label.
*/
public setText(text: string): void {
this.label.setText(text);
}
/**
* Updates the scaling until the text fits the given size.
* @param {number} scale
*/
public updateScaling(scale: number): void {
this.scale.set(scale);
this.label.setMaxSize(this.width * 0.90, this.height * 0.98);
this.label.setText(this.label.text);
}
/**
* Override destroy function so it also destroys the label attached to the button.
* @param destroyChildren
*/
public destroy(destroyChildren?: boolean): void {
this.label.destroy(destroyChildren);
this.id = null;
this.label = null;
super.destroy(destroyChildren);
}
/**
* Play click sound every time the button is released.
* @param destroyChildren
*/
private playSound(): void {
SoundManager.getInstance().play(Sounds.Click);
} |
<<<<<<<
easingFunction: this.params.transitionEasingFunction,
=======
animateSliceHeight: this.params.transitionAnimateSliceHeight,
animateSliceWidth: this.params.transitionAnimateSliceWidth,
opacity: this.params.transitionOpacity,
>>>>>>>
easingFunction: this.params.transitionEasingFunction,
animateSliceHeight: this.params.transitionAnimateSliceHeight,
animateSliceWidth: this.params.transitionAnimateSliceWidth,
opacity: this.params.transitionOpacity, |
<<<<<<<
transitionDuration: 250,
=======
transitionDuration: 500,
transitionOpacity: false,
>>>>>>>
transitionDuration: 250,
transitionOpacity: false, |
<<<<<<<
import isCI from 'is-ci';
import { gt } from 'semver';
=======
import merge from 'deepmerge';
import env from 'dotenv';
import envCi from 'env-ci';
import { gt, inc, ReleaseType } from 'semver';
>>>>>>>
import merge from 'deepmerge';
import env from 'dotenv';
import isCI from 'is-ci';
import { gt, inc, ReleaseType } from 'semver'; |
<<<<<<<
import merge from 'deepmerge';
=======
import env from 'dotenv';
>>>>>>>
import merge from 'deepmerge';
import env from 'dotenv'; |
<<<<<<<
export interface RenameInitialValue {
range: IRange;
text?: string;
}
=======
>>>>>>>
export interface RenameInitialValue {
range: IRange;
text?: string;
} |
<<<<<<<
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
import * as nls from 'vs/nls';
=======
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
>>>>>>>
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
import * as nls from 'vs/nls';
<<<<<<<
static ID = VIEWLET_ID;
static LABEL = nls.localize('toggleGitViewlet', "Show Git");
=======
static readonly ID = VIEWLET_ID;
static LABEL = localize('toggleGitViewlet', "Show Git");
>>>>>>>
static readonly ID = VIEWLET_ID;
static LABEL = nls.localize('toggleGitViewlet', "Show Git");
<<<<<<<
nls.localize('view', "View")
);
// Register configuration
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
configurationRegistry.registerConfiguration({
id: 'scm',
order: 20,
title: nls.localize('scmConfigurationTitle', "SCM"),
type: 'object',
properties: {
'scm.showSingleSourceControlProvider': {
type: 'boolean',
description: nls.localize({ comment: ['This is the description for a setting'], key: 'showSingleSourceControlProvider' }, "Whether to show Source Control Provider for single repository."),
default: false
}
}
});
=======
localize('view', "View")
);
Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
id: 'scm',
order: 5,
type: 'object',
properties: {
'scm.diffDecorations': {
type: 'string',
enum: ['all', 'gutter', 'overview', 'none'],
default: 'all',
description: localize('diffDecorations', "Controls diff decorations in the editor.")
},
'scm.inputCounter': {
type: 'string',
enum: ['always', 'warn', 'off'],
default: 'warn',
description: localize('inputCounter', "Controls when to display the input counter.")
}
}
});
>>>>>>>
nls.localize('view', "View")
);
Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).registerConfiguration({
id: 'scm',
order: 5,
title: nls.localize('scmConfigurationTitle', "SCM"),
type: 'object',
properties: {
'scm.showSingleSourceControlProvider': {
type: 'boolean',
description: nls.localize({ comment: ['This is the description for a setting'], key: 'showSingleSourceControlProvider' }, "Whether to show Source Control Provider for single repository."),
default: false
},
'scm.diffDecorations': {
type: 'string',
enum: ['all', 'gutter', 'overview', 'none'],
default: 'all',
description: nls.localize('diffDecorations', "Controls diff decorations in the editor.")
},
'scm.inputCounter': {
type: 'string',
enum: ['always', 'warn', 'off'],
default: 'warn',
description: nls.localize('inputCounter', "Controls when to display the input counter.")
}
}
}); |
<<<<<<<
import { WorkbenchListFocusContextKey, IListService } from 'vs/platform/list/browser/listService';
=======
import { openFolderCommand, openFileInNewWindowCommand, openFileFolderInNewWindowCommand, openFolderInNewWindowCommand, openWorkspaceInNewWindowCommand } from 'vs/workbench/browser/actions/workspaceActions';
import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey } from 'vs/platform/list/browser/listService';
>>>>>>>
import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey } from 'vs/platform/list/browser/listService'; |
<<<<<<<
autoGuessEncoding: boolean;
=======
defaultLanguage: string;
>>>>>>>
autoGuessEncoding: boolean;
defaultLanguage: string; |
<<<<<<<
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService';
import { SplitView, Orientation, Sizing } from 'vs/base/browser/ui/splitview/splitview';
=======
>>>>>>>
import { SplitView, Orientation, Sizing } from 'vs/base/browser/ui/splitview/splitview'; |
<<<<<<<
import './mainThreadComments';
=======
import './mainThreadUrls';
>>>>>>>
import './mainThreadComments';
import './mainThreadUrls'; |
<<<<<<<
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureTaskRunnerAction, ConfigureTaskRunnerAction.ID, ConfigureTaskRunnerAction.TEXT), tasksCategory);
if (Env.enableTasks) {
// Task Service
registerSingleton(ITaskService, TaskService);
// Actions
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(BuildAction, BuildAction.ID, BuildAction.TEXT, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_B }), tasksCategory);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(TestAction, TestAction.ID, TestAction.TEXT), tasksCategory);
// workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(RebuildAction, RebuildAction.ID, RebuildAction.TEXT), tasksCategory);
// workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CleanAction, CleanAction.ID, CleanAction.TEXT), tasksCategory);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(TerminateAction, TerminateAction.ID, TerminateAction.TEXT), tasksCategory);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowLogAction, ShowLogAction.ID, ShowLogAction.TEXT), tasksCategory);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(RunTaskAction, RunTaskAction.ID, RunTaskAction.TEXT), tasksCategory);
// Register Quick Open
(<IQuickOpenRegistry>Registry.as(QuickOpenExtensions.Quickopen)).registerQuickOpenHandler(
new QuickOpenHandlerDescriptor(
'vs/workbench/parts/tasks/browser/taskQuickOpen',
'QuickOpenHandler',
'task ',
nls.localize('taskCommands', "Run Task")
)
);
// Status bar
let statusbarRegistry = <IStatusbarRegistry>Registry.as(StatusbarExtensions.Statusbar);
statusbarRegistry.registerStatusbarItem(new StatusbarItemDescriptor(StatusBarItem, StatusbarAlignment.LEFT, 50 /* Medium Priority */));
// Output channel
let outputChannelRegistry = <IOutputChannelRegistry>Registry.as(OutputExt.OutputChannels);
outputChannelRegistry.registerChannel(TaskService.OutputChannelId, TaskService.OutputChannelLabel);
(<IWorkbenchContributionsRegistry>Registry.as(WorkbenchExtensions.Workbench)).registerWorkbenchContribution(TaskServiceParticipant);
// tasks.json validation
let schemaId = 'vscode://schemas/tasks';
let schema : IJSONSchema =
{
'id': schemaId,
'description': 'Task definition file',
'type': 'object',
'default': {
'version': '0.1.0',
'command': 'myCommand',
'isShellCommand': false,
'args': [],
'showOutput': 'always',
'tasks': [
=======
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureTaskRunnerAction, ConfigureTaskRunnerAction.ID, ConfigureTaskRunnerAction.TEXT), tasksCategory, ['configure', 'task', 'runner']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(BuildAction, BuildAction.ID, BuildAction.TEXT, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_B }), tasksCategory, ['run', 'build', 'task']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(TestAction, TestAction.ID, TestAction.TEXT, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_T }), tasksCategory, ['run', 'test', 'talk']);
// workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(RebuildAction, RebuildAction.ID, RebuildAction.TEXT), tasksCategory);
// workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CleanAction, CleanAction.ID, CleanAction.TEXT), tasksCategory);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(TerminateAction, TerminateAction.ID, TerminateAction.TEXT), tasksCategory, ['terminate', 'running', 'task']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowLogAction, ShowLogAction.ID, ShowLogAction.TEXT), tasksCategory, ['task', 'log']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(RunTaskAction, RunTaskAction.ID, RunTaskAction.TEXT), tasksCategory, ['run', 'task']);
// Task Service
registerSingleton(ITaskService, TaskService);
// Register Quick Open
(<IQuickOpenRegistry>Registry.as(QuickOpenExtensions.Quickopen)).registerQuickOpenHandler(
new QuickOpenHandlerDescriptor(
'vs/workbench/parts/tasks/browser/taskQuickOpen',
'QuickOpenHandler',
'task ',
nls.localize('taskCommands', "Run Task")
)
);
// Status bar
let statusbarRegistry = <IStatusbarRegistry>Registry.as(StatusbarExtensions.Statusbar);
statusbarRegistry.registerStatusbarItem(new StatusbarItemDescriptor(StatusBarItem, StatusbarAlignment.LEFT, 50 /* Medium Priority */));
// Output channel
let outputChannelRegistry = <IOutputChannelRegistry>Registry.as(OutputExt.OutputChannels);
outputChannelRegistry.registerChannel(TaskService.OutputChannelId, TaskService.OutputChannelLabel);
// (<IWorkbenchContributionsRegistry>Registry.as(WorkbenchExtensions.Workbench)).registerWorkbenchContribution(TaskServiceParticipant);
// tasks.json validation
let schemaId = 'vscode://schemas/tasks';
let schema : IJSONSchema =
{
'id': schemaId,
'description': 'Task definition file',
'type': 'object',
'default': {
'version': '0.1.0',
'command': 'myCommand',
'isShellCommand': false,
'args': [],
'showOutput': 'always',
'tasks': [
{
'taskName': 'build',
'showOutput': 'silent',
'isBuildCommand': true,
'problemMatcher': ['$tsc', '$lessCompile']
}
]
},
'definitions': {
'showOutputType': {
'type': 'string',
'enum': ['always', 'silent', 'never'],
'default': 'silent'
},
'patternType': {
'anyOf': [
{
'type': 'string',
'enum': ['$tsc', '$tsc-watch' ,'$msCompile', '$lessCompile', '$gulp-tsc', '$cpp', '$csc', '$vb', '$jshint', '$jshint-stylish', '$eslint-compact', '$eslint-stylish', '$go']
},
{
'$ref': '#/definitions/pattern'
},
>>>>>>>
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ConfigureTaskRunnerAction, ConfigureTaskRunnerAction.ID, ConfigureTaskRunnerAction.TEXT), tasksCategory, ['configure', 'task', 'runner']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(BuildAction, BuildAction.ID, BuildAction.TEXT, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_B }), tasksCategory, ['run', 'build', 'task']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(TestAction, TestAction.ID, TestAction.TEXT), tasksCategory, ['run', 'test', 'talk']);
// workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(RebuildAction, RebuildAction.ID, RebuildAction.TEXT), tasksCategory);
// workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CleanAction, CleanAction.ID, CleanAction.TEXT), tasksCategory);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(TerminateAction, TerminateAction.ID, TerminateAction.TEXT), tasksCategory, ['terminate', 'running', 'task']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ShowLogAction, ShowLogAction.ID, ShowLogAction.TEXT), tasksCategory, ['task', 'log']);
workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(RunTaskAction, RunTaskAction.ID, RunTaskAction.TEXT), tasksCategory, ['run', 'task']);
// Task Service
registerSingleton(ITaskService, TaskService);
// Register Quick Open
(<IQuickOpenRegistry>Registry.as(QuickOpenExtensions.Quickopen)).registerQuickOpenHandler(
new QuickOpenHandlerDescriptor(
'vs/workbench/parts/tasks/browser/taskQuickOpen',
'QuickOpenHandler',
'task ',
nls.localize('taskCommands', "Run Task")
)
);
// Status bar
let statusbarRegistry = <IStatusbarRegistry>Registry.as(StatusbarExtensions.Statusbar);
statusbarRegistry.registerStatusbarItem(new StatusbarItemDescriptor(StatusBarItem, StatusbarAlignment.LEFT, 50 /* Medium Priority */));
// Output channel
let outputChannelRegistry = <IOutputChannelRegistry>Registry.as(OutputExt.OutputChannels);
outputChannelRegistry.registerChannel(TaskService.OutputChannelId, TaskService.OutputChannelLabel);
// (<IWorkbenchContributionsRegistry>Registry.as(WorkbenchExtensions.Workbench)).registerWorkbenchContribution(TaskServiceParticipant);
// tasks.json validation
let schemaId = 'vscode://schemas/tasks';
let schema : IJSONSchema =
{
'id': schemaId,
'description': 'Task definition file',
'type': 'object',
'default': {
'version': '0.1.0',
'command': 'myCommand',
'isShellCommand': false,
'args': [],
'showOutput': 'always',
'tasks': [
{
'taskName': 'build',
'showOutput': 'silent',
'isBuildCommand': true,
'problemMatcher': ['$tsc', '$lessCompile']
}
]
},
'definitions': {
'showOutputType': {
'type': 'string',
'enum': ['always', 'silent', 'never'],
'default': 'silent'
},
'patternType': {
'anyOf': [
{
'type': 'string',
'enum': ['$tsc', '$tsc-watch' ,'$msCompile', '$lessCompile', '$gulp-tsc', '$cpp', '$csc', '$vb', '$jshint', '$jshint-stylish', '$eslint-compact', '$eslint-stylish', '$go']
},
{
'$ref': '#/definitions/pattern'
}, |
<<<<<<<
* Checks if the activity bar is currently hidden or not
*/
isActivityBarHidden(): boolean;
/**
* Set activity bar hidden or not
*/
setActivityBarHidden(hidden: boolean): void;
/**
* Returns iff the titlebar part is currently hidden or not.
=======
* Returns iff the custom titlebar part is visible.
>>>>>>>
* Checks if the activity bar is currently hidden or not
*/
isActivityBarHidden(): boolean;
/**
* Set activity bar hidden or not
*/
setActivityBarHidden(hidden: boolean): void;
/**
* Returns iff the custom titlebar part is visible. |
<<<<<<<
import ActionsRenderer = require('vs/base/parts/tree/browser/actionsRenderer');
import Actions = require('vs/base/common/actions');
import {compareAnything} from 'vs/base/common/comparers';
import ActionBar = require('vs/base/browser/ui/actionbar/actionbar');
import TreeDefaults = require('vs/base/parts/tree/browser/treeDefaults');
import HighlightedLabel = require('vs/base/browser/ui/highlightedlabel/highlightedLabel');
import {OcticonLabel} from 'vs/base/browser/ui/octiconLabel/octiconLabel';
=======
import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer';
import {Action, IAction, IActionRunner} from 'vs/base/common/actions';
import {compareAnything, compareByPrefix} from 'vs/base/common/comparers';
import {ActionBar, IActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
import {LegacyRenderer, ILegacyTemplateData} from 'vs/base/parts/tree/browser/treeDefaults';
import {HighlightedLabel} from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
>>>>>>>
import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer';
import {Action, IAction, IActionRunner} from 'vs/base/common/actions';
import {compareAnything, compareByPrefix} from 'vs/base/common/comparers';
import {ActionBar, IActionItem} from 'vs/base/browser/ui/actionbar/actionbar';
import {LegacyRenderer, ILegacyTemplateData} from 'vs/base/parts/tree/browser/treeDefaults';
import {HighlightedLabel} from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
import {OcticonLabel} from 'vs/base/browser/ui/octiconLabel/octiconLabel';
<<<<<<<
label: HighlightedLabel.HighlightedLabel;
meta: OcticonLabel;
description: HighlightedLabel.HighlightedLabel;
actionBar: ActionBar.ActionBar;
=======
label: HighlightedLabel;
meta: HTMLSpanElement;
description: HighlightedLabel;
actionBar: ActionBar;
>>>>>>>
label: HighlightedLabel;
meta: OcticonLabel;
description: HighlightedLabel;
actionBar: ActionBar; |
<<<<<<<
terminal: {
external: {
windowsExec: 'testWindowsShell',
linuxExec: 'testLinuxShell'
}
=======
externalTerminal: {
windowsExec: 'testWindowsShell',
macExec: 'testMacShell',
linuxExec: 'testLinuxShell'
>>>>>>>
terminal: {
external: {
windowsExec: 'testWindowsShell',
macExec: 'testMacShell',
linuxExec: 'testLinuxShell'
} |
<<<<<<<
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
import {ShowEditorsInGroupAction, CloseEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseAllEditorsAction, MoveGroupLeftAction, MoveGroupRightAction, SplitEditorAction, CloseEditorAction} from 'vs/workbench/browser/parts/editor/editorActions';
=======
import {IDisposable} from 'vs/base/common/lifecycle';
>>>>>>>
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
import {ShowEditorsInGroupAction, CloseEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseAllEditorsAction, MoveGroupLeftAction, MoveGroupRightAction, SplitEditorAction, CloseEditorAction} from 'vs/workbench/browser/parts/editor/editorActions';
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
<<<<<<<
private _onGroupFocusChanged: Emitter<void>;
private _onEditorTitleDoubleclick: Emitter<Position>;
=======
private editorInputStateChangeListener: IDisposable;
>>>>>>>
private _onGroupFocusChanged: Emitter<void>;
private _onEditorTitleDoubleclick: Emitter<Position>;
private toDispose: IDisposable[];
<<<<<<<
// Close
this.closeEditorActions = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorAction, CloseEditorAction.ID, CloseEditorAction.LABEL));
// Show Editors
this.showEditorsOfGroup = POSITIONS.map((position) => this.instantiationService.createInstance(ShowEditorsInGroupAction, ShowEditorsInGroupAction.ID, ShowEditorsInGroupAction.LABEL));
// Split
this.splitEditorAction = this.instantiationService.createInstance(SplitEditorAction, SplitEditorAction.ID, SplitEditorAction.LABEL);
// Move Group Left
this.moveGroupLeftActions = POSITIONS.map((position) => this.instantiationService.createInstance(MoveGroupLeftAction, MoveGroupLeftAction.ID, MoveGroupLeftAction.LABEL));
// Move Group Right
this.moveGroupRightActions = POSITIONS.map((position) => this.instantiationService.createInstance(MoveGroupRightAction, MoveGroupRightAction.ID, MoveGroupRightAction.LABEL));
// Close All Editors in Group
this.closeEditorsInGroupActions = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorsInGroupAction, CloseEditorsInGroupAction.ID, CloseEditorsInGroupAction.LABEL));
// Close Editors in Other Groups
this.closeEditorsInOtherGroupsActions = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorsInOtherGroupsAction, CloseEditorsInOtherGroupsAction.ID, CloseEditorsInOtherGroupsAction.LABEL));
// Close All Editors
this.closeAllEditorsAction = this.instantiationService.createInstance(CloseAllEditorsAction, CloseAllEditorsAction.ID, CloseAllEditorsAction.LABEL);
=======
// Update editor input state indicators on state changes
this.editorInputStateChangeListener = this.eventService.addListener2(WorkbenchEventType.EDITOR_INPUT_STATE_CHANGED, (event: EditorInputEvent) => {
this.updateEditorInputStateIndicator(event);
});
>>>>>>>
// Close
this.closeEditorActions = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorAction, CloseEditorAction.ID, CloseEditorAction.LABEL));
// Show Editors
this.showEditorsOfGroup = POSITIONS.map((position) => this.instantiationService.createInstance(ShowEditorsInGroupAction, ShowEditorsInGroupAction.ID, ShowEditorsInGroupAction.LABEL));
// Split
this.splitEditorAction = this.instantiationService.createInstance(SplitEditorAction, SplitEditorAction.ID, SplitEditorAction.LABEL);
// Move Group Left
this.moveGroupLeftActions = POSITIONS.map((position) => this.instantiationService.createInstance(MoveGroupLeftAction, MoveGroupLeftAction.ID, MoveGroupLeftAction.LABEL));
// Move Group Right
this.moveGroupRightActions = POSITIONS.map((position) => this.instantiationService.createInstance(MoveGroupRightAction, MoveGroupRightAction.ID, MoveGroupRightAction.LABEL));
// Close All Editors in Group
this.closeEditorsInGroupActions = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorsInGroupAction, CloseEditorsInGroupAction.ID, CloseEditorsInGroupAction.LABEL));
// Close Editors in Other Groups
this.closeEditorsInOtherGroupsActions = POSITIONS.map((position) => this.instantiationService.createInstance(CloseEditorsInOtherGroupsAction, CloseEditorsInOtherGroupsAction.ID, CloseEditorsInOtherGroupsAction.LABEL));
// Close All Editors
this.closeAllEditorsAction = this.instantiationService.createInstance(CloseAllEditorsAction, CloseAllEditorsAction.ID, CloseAllEditorsAction.LABEL);
<<<<<<<
private targetInToolbar(target: HTMLElement, position: Position): boolean {
return DOM.isAncestor(target, this.editorActionsToolbar[position].getContainer().getHTMLElement()) || DOM.isAncestor(target, this.editorTitleToolbar[position].getContainer().getHTMLElement());
}
=======
// Action Run Handling
this.editorActionsToolbar[position].actionRunner.addListener2(BaseEventType.RUN, (e: any) => {
>>>>>>>
private targetInToolbar(target: HTMLElement, position: Position): boolean {
return DOM.isAncestor(target, this.editorActionsToolbar[position].getContainer().getHTMLElement()) || DOM.isAncestor(target, this.editorTitleToolbar[position].getContainer().getHTMLElement());
}
<<<<<<<
=======
if (this.editorInputStateChangeListener) {
this.editorInputStateChangeListener.dispose();
}
>>>>>>> |
<<<<<<<
import {NativescriptConnectionOptions} from "../driver/nativescript/NativescriptConnectionOptions";
=======
import {ExpoConnectionOptions} from "../driver/expo/ExpoConnectionOptions";
>>>>>>>
import {NativescriptConnectionOptions} from "../driver/nativescript/NativescriptConnectionOptions";
import {ExpoConnectionOptions} from "../driver/expo/ExpoConnectionOptions"; |
<<<<<<<
import { IAction, IActionRunner } from 'vs/base/common/actions';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
=======
import { IAction, IActionRunner, IActionItem } from 'vs/base/common/actions';
>>>>>>>
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { IAction, IActionRunner, IActionItem } from 'vs/base/common/actions';
<<<<<<<
import { attachListStyler } from "vs/platform/theme/common/styler";
import { IThemeService } from "vs/platform/theme/common/themeService";
=======
import { createActionItem } from 'vs/platform/actions/browser/menuItemActionItem';
>>>>>>>
import { attachListStyler } from "vs/platform/theme/common/styler";
import { IThemeService } from "vs/platform/theme/common/themeService";
import { createActionItem } from 'vs/platform/actions/browser/menuItemActionItem';
<<<<<<<
private providerDisposables = IDisposable[];
=======
private menus: TreeExplorerMenus;
>>>>>>>
private providerDisposables: IDisposable[];
private menus: TreeExplorerMenus; |
<<<<<<<
import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
=======
import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
>>>>>>>
import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
<<<<<<<
const USE_PIECE_TREE_IMPLEMENTATION = true;
=======
const USE_CHUNKS_TEXT_BUFFER = false;
>>>>>>>
const USE_PIECE_TREE_IMPLEMENTATION = true;
const USE_CHUNKS_TEXT_BUFFER = false;
<<<<<<<
if (USE_PIECE_TREE_IMPLEMENTATION) {
return new PieceTreeTextBufferBuilder();
}
=======
if (USE_CHUNKS_TEXT_BUFFER) {
return new ChunksTextBufferBuilder();
}
>>>>>>>
if (USE_PIECE_TREE_IMPLEMENTATION) {
return new PieceTreeTextBufferBuilder();
}
if (USE_CHUNKS_TEXT_BUFFER) {
return new ChunksTextBufferBuilder();
} |
<<<<<<<
import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
=======
export interface IEnvironment {
appSettingsHome: string;
disableExtensions: boolean;
userExtensionsHome: string;
extensionDevelopmentPath: string;
extensionTestsPath: string;
}
export interface IInitConfiguration {
_initConfigurationBrand: void;
}
export interface IInitData {
parentPid: number;
environment: IEnvironment;
contextService: {
workspace: IWorkspace;
};
extensions: IExtensionDescription[];
configuration: IInitConfiguration;
telemetryInfo: ITelemetryInfo;
}
>>>>>>>
import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel';
export interface IEnvironment {
appSettingsHome: string;
disableExtensions: boolean;
userExtensionsHome: string;
extensionDevelopmentPath: string;
extensionTestsPath: string;
}
export interface IInitConfiguration {
_initConfigurationBrand: void;
}
export interface IInitData {
parentPid: number;
environment: IEnvironment;
contextService: {
workspace: IWorkspace;
};
extensions: IExtensionDescription[];
configuration: IInitConfiguration;
telemetryInfo: ITelemetryInfo;
} |
<<<<<<<
private currentNode: Node;
=======
private nodeLabels = {};
>>>>>>>
private currentNode: Node;
private nodeLabels = {}; |
<<<<<<<
const patternExclusionsHistory = this.viewletSettings['query.folderExclusionsHistory'] || [];
const exclusionsUsePattern = this.viewletSettings['query.exclusionsUsePattern'];
const includesUsePattern = this.viewletSettings['query.includesUsePattern'];
=======
>>>>>>>
const patternExclusionsHistory = this.viewletSettings['query.folderExclusionsHistory'] || [];
const exclusionsUsePattern = this.viewletSettings['query.exclusionsUsePattern'];
const includesUsePattern = this.viewletSettings['query.includesUsePattern'];
<<<<<<<
this.inputPatternExclusions.setIsGlobPattern(exclusionsUsePattern);
this.inputPatternExclusions.setValue(patternExclusions);
this.inputPatternExclusions.setUseIgnoreFiles(useIgnoreFiles);
this.inputPatternExclusions.setUseExcludeSettings(useExcludeSettings);
this.inputPatternExclusions.setHistory(patternExclusionsHistory);
=======
this.inputPatternExcludes.setValue(patternExclusions);
this.inputPatternExcludes.setUseIgnoreFiles(useIgnoreFiles);
this.inputPatternExcludes.setUseExcludeSettings(useExcludeSettings);
>>>>>>>
this.inputPatternExcludes.setValue(patternExclusions);
this.inputPatternExcludes.setUseIgnoreFiles(useIgnoreFiles);
this.inputPatternExcludes.setUseExcludeSettings(useExcludeSettings);
this.inputPatternExcludes.setHistory(patternExclusionsHistory);
<<<<<<<
this.inputPatternExclusions.onSubmit(() => this.onQueryChanged(true, true));
this.trackInputBox(this.inputPatternExclusions.inputFocusTracker, this.inputPatternExclusionsFocussed);
=======
this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
this.trackInputBox(this.inputPatternExcludes.inputFocusTracker);
>>>>>>>
this.inputPatternExcludes.onSubmit(() => this.onQueryChanged(true, true));
this.trackInputBox(this.inputPatternExcludes.inputFocusTracker, this.inputPatternExclusionsFocussed);
<<<<<<<
|| this.inputPatternExclusions.inputHasFocus());
if (contextKey) {
contextKey.set(false);
}
=======
|| this.inputPatternExcludes.inputHasFocus());
>>>>>>>
|| this.inputPatternExcludes.inputHasFocus());
if (contextKey) {
contextKey.set(false);
}
<<<<<<<
const searchHistory = this.searchWidget.getHistory();
const patternExcludes = this.inputPatternExclusions.getValue().trim();
const patternExcludesHistory = this.inputPatternExclusions.getHistory();
const exclusionsUsePattern = this.inputPatternExclusions.isGlobPattern();
=======
const patternExcludes = this.inputPatternExcludes.getValue().trim();
>>>>>>>
const patternExcludes = this.inputPatternExcludes.getValue().trim();
<<<<<<<
const patternIncludesHistory = this.inputPatternIncludes.getHistory();
const includesUsePattern = this.inputPatternIncludes.isGlobPattern();
const useIgnoreFiles = this.inputPatternExclusions.useIgnoreFiles();
=======
const useIgnoreFiles = this.inputPatternExcludes.useIgnoreFiles();
>>>>>>>
const useIgnoreFiles = this.inputPatternExcludes.useIgnoreFiles();
const searchHistory = this.searchWidget.getHistory();
const patternExcludesHistory = this.inputPatternExcludes.getHistory();
const patternIncludesHistory = this.inputPatternIncludes.getHistory();
<<<<<<<
this.viewletSettings['query.folderExclusionsHistory'] = patternExcludesHistory;
this.viewletSettings['query.exclusionsUsePattern'] = exclusionsUsePattern;
=======
>>>>>>>
<<<<<<<
this.viewletSettings['query.folderIncludesHistory'] = patternIncludesHistory;
this.viewletSettings['query.includesUsePattern'] = includesUsePattern;
=======
>>>>>>>
this.viewletSettings['query.folderExclusionsHistory'] = patternExcludesHistory;
this.viewletSettings['query.folderIncludesHistory'] = patternIncludesHistory; |
<<<<<<<
=======
import { SettingsComponent } from './components/pages/settings/settings.component';
import { PasswordComponent } from './components/pages/settings/password/password.component';
import { NodeAppButtonComponent } from './components/pages/node/apps/node-app-button/node-app-button.component';
>>>>>>>
import { SettingsComponent } from './components/pages/settings/settings.component';
import { PasswordComponent } from './components/pages/settings/password/password.component';
import { NodeAppButtonComponent } from './components/pages/node/apps/node-app-button/node-app-button.component';
<<<<<<<
import { StartupConfigComponent } from './components/pages/node/apps/startup-config/startup-config.component';
import { KeyInputComponent } from './components/layout/key-input/key-input.component';
=======
import { AppTranslationModule } from './app-translation.module';
>>>>>>>
import { StartupConfigComponent } from './components/pages/node/apps/startup-config/startup-config.component';
import { KeyInputComponent } from './components/layout/key-input/key-input.component';
import { AppTranslationModule } from './app-translation.module';
<<<<<<<
=======
SettingsComponent,
PasswordComponent,
NodeAppButtonComponent,
>>>>>>>
SettingsComponent,
PasswordComponent,
NodeAppButtonComponent, |
<<<<<<<
import { FormsModule } from '@angular/forms';
import {
MatToolbarModule,
MatTableModule,
MatButtonModule,
MatIconModule,
MatTooltipModule,
MatChipsModule,
MatMenuModule,
MatSnackBarModule,
MatSlideToggleModule,
MatListModule
} from '@angular/material';
import {FooterComponent} from './components/components/footer/footer.component';
=======
import {FooterComponent} from './components/layout/footer/footer.component';
>>>>>>>
import { FormsModule } from '@angular/forms';
import {
MatToolbarModule,
MatTableModule,
MatButtonModule,
MatIconModule,
MatTooltipModule,
MatChipsModule,
MatMenuModule,
MatSnackBarModule,
MatSlideToggleModule,
MatListModule,
ErrorStateMatcher,
MAT_DIALOG_DEFAULT_OPTIONS,
MAT_SNACK_BAR_DEFAULT_OPTIONS,
MatDialogModule,
MatFormFieldModule,
MatInputModule,
ShowOnDirtyErrorStateMatcher
}
from '@angular/material';
import {FooterComponent} from './components/layout/footer/footer.component';
<<<<<<<
import { NodeAppButtonComponent } from './components/components/node-app-button/node-app-button.component';
import { SshWarningDialogComponent } from './components/components/ssh-warning-dialog/ssh-warning-dialog.component';
import { AppsSettingsComponent } from './components/components/apps-settings/apps-settings.component';
import {ClipboardService} from "./services/clipboard.service";
import {ClipboardDirective} from "./directives/clipboard.directive";
=======
import { AppsComponent } from './components/pages/node/apps/apps.component';
import { LogComponent } from './components/pages/node/apps/log/log.component';
import { AppSshsComponent } from './components/pages/node/apps/app-sshs/app-sshs.component';
import { SshsStartupComponent } from './components/pages/node/apps/app-sshs/sshs-startup/sshs-startup.component';
import { SshsWhitelistComponent } from './components/pages/node/apps/app-sshs/sshs-whitelist/sshs-whitelist.component';
import { AppSshcComponent } from './components/pages/node/apps/app-sshc/app-sshc.component';
import { SshcStartupComponent } from './components/pages/node/apps/app-sshc/sshc-startup/sshc-startup.component';
import { SshcKeysComponent } from './components/pages/node/apps/app-sshc/sshc-keys/sshc-keys.component';
import { KeypairComponent } from './components/layout/keypair/keypair.component';
import { AppSockscComponent } from './components/pages/node/apps/app-socksc/app-socksc.component';
import { SockscConnectComponent } from './components/pages/node/apps/app-socksc/socksc-connect/socksc-connect.component';
import { SockscStartupComponent } from './components/pages/node/apps/app-socksc/socksc-startup/socksc-startup.component';
>>>>>>>
import { AppsComponent } from './components/pages/node/apps/apps.component';
import { LogComponent } from './components/pages/node/apps/log/log.component';
import { AppSshsComponent } from './components/pages/node/apps/app-sshs/app-sshs.component';
import { SshsStartupComponent } from './components/pages/node/apps/app-sshs/sshs-startup/sshs-startup.component';
import { SshsWhitelistComponent } from './components/pages/node/apps/app-sshs/sshs-whitelist/sshs-whitelist.component';
import { AppSshcComponent } from './components/pages/node/apps/app-sshc/app-sshc.component';
import { SshcStartupComponent } from './components/pages/node/apps/app-sshc/sshc-startup/sshc-startup.component';
import { SshcKeysComponent } from './components/pages/node/apps/app-sshc/sshc-keys/sshc-keys.component';
import { KeypairComponent } from './components/layout/keypair/keypair.component';
import { AppSockscComponent } from './components/pages/node/apps/app-socksc/app-socksc.component';
import { SockscConnectComponent } from './components/pages/node/apps/app-socksc/socksc-connect/socksc-connect.component';
import { SockscStartupComponent } from './components/pages/node/apps/app-socksc/socksc-startup/socksc-startup.component';
import { NodeAppButtonComponent } from './components/components/node-app-button/node-app-button.component';
import { SshWarningDialogComponent } from './components/components/ssh-warning-dialog/ssh-warning-dialog.component';
import { AppsSettingsComponent } from './components/components/apps-settings/apps-settings.component';
import { ClipboardService } from "./services/clipboard.service";
import { ClipboardDirective } from "./directives";
<<<<<<<
TerminalComponent,
SshWarningDialogComponent,
AppsSettingsComponent
=======
TerminalComponent,
LogComponent,
SshsStartupComponent,
SshsWhitelistComponent,
SshcKeysComponent,
SshcStartupComponent,
SockscConnectComponent,
SockscStartupComponent,
>>>>>>>
TerminalComponent,
SshWarningDialogComponent,
AppsSettingsComponent,
TerminalComponent,
LogComponent,
SshsStartupComponent,
SshsWhitelistComponent,
SshcKeysComponent,
SshcStartupComponent,
SockscConnectComponent,
SockscStartupComponent,
<<<<<<<
ClipboardService,
{provide: MAT_SNACK_BAR_DEFAULT_OPTIONS, useValue: {duration: 2500}},
=======
{provide: MAT_SNACK_BAR_DEFAULT_OPTIONS, useValue: {duration: 2500, verticalPosition: 'top'}},
>>>>>>>
{provide: MAT_SNACK_BAR_DEFAULT_OPTIONS, useValue: {duration: 2500, verticalPosition: 'top'}},
ClipboardService,
{provide: MAT_SNACK_BAR_DEFAULT_OPTIONS, useValue: {duration: 2500}}, |
<<<<<<<
@IContextKeyService contextKeyService: IContextKeyService,
@IConfigurationService private configurationService: IConfigurationService,
=======
@IContextKeyService private contextKeyService: IContextKeyService,
@IConfigurationService protected configurationService: IConfigurationService,
@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
>>>>>>>
@IContextKeyService contextKeyService: IContextKeyService,
@IConfigurationService configurationService: IConfigurationService, |
<<<<<<<
import { ContextKeyAndExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
import { OS } from 'vs/base/common/platform';
=======
import { IContext, ContextKeyAndExpr, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
import { NormalizedKeybindingItem } from 'vs/platform/keybinding/common/normalizedKeybindingItem';
>>>>>>>
import { ContextKeyAndExpr, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey';
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
import { OS } from 'vs/base/common/platform';
<<<<<<<
assert.equal(resolver.resolve({ bar: 'baz' }, null, getDispatchStr(<SimpleKeybinding>runtimeKeybinding)).commandId, 'yes');
assert.equal(resolver.resolve({ bar: 'bz' }, null, getDispatchStr(<SimpleKeybinding>runtimeKeybinding)), null);
=======
assert.equal(resolver.resolve(createContext({ bar: 'baz' }), null, new SimpleKeybinding(keybinding).value.toString()).commandId, 'yes');
assert.equal(resolver.resolve(createContext({ bar: 'bz' }), null, new SimpleKeybinding(keybinding).value.toString()), null);
>>>>>>>
assert.equal(resolver.resolve(createContext({ bar: 'baz' }), null, getDispatchStr(<SimpleKeybinding>runtimeKeybinding)).commandId, 'yes');
assert.equal(resolver.resolve(createContext({ bar: 'bz' }), null, getDispatchStr(<SimpleKeybinding>runtimeKeybinding)), null);
<<<<<<<
assert.equal(resolver.resolve({ bar: 'baz' }, null, getDispatchStr(<SimpleKeybinding>runtimeKeybinding)).commandArgs, commandArgs);
=======
assert.equal(resolver.resolve(createContext({ bar: 'baz' }), null, new SimpleKeybinding(keybinding).value.toString()).commandArgs, commandArgs);
>>>>>>>
assert.equal(resolver.resolve(createContext({ bar: 'baz' }), null, getDispatchStr(<SimpleKeybinding>runtimeKeybinding)).commandArgs, commandArgs);
<<<<<<<
let testResolve = (ctx: any, _expectedKey: number, commandId: string) => {
const expectedKey = createKeybinding(_expectedKey, OS);
=======
let testResolve = (ctx: IContext, _expectedKey: number, commandId: string) => {
let expectedKey = createKeybinding(_expectedKey);
>>>>>>>
let testResolve = (ctx: IContext, _expectedKey: number, commandId: string) => {
const expectedKey = createKeybinding(_expectedKey, OS); |
<<<<<<<
terminal: {
external: {
linuxExec: string,
windowsExec: string
}
=======
externalTerminal: {
linuxExec: string,
macExec: string,
windowsExec: string
>>>>>>>
terminal: {
external: {
linuxExec: string,
macExec: string,
windowsExec: string
} |
<<<<<<<
import { SimpleFileResourceDragAndDrop } from 'vs/workbench/browser/dnd';
import { INextStorage2Service, StorageScope } from 'vs/platform/storage2/common/storage2';
=======
import { IStorageService } from 'vs/platform/storage/common/storage';
import { Scope } from 'vs/workbench/common/memento';
>>>>>>>
import { INextStorage2Service, StorageScope } from 'vs/platform/storage2/common/storage2';
<<<<<<<
@INextStorage2Service nextStorage2Service: INextStorage2Service,
@IContextKeyService contextKeyService: IContextKeyService
=======
@IStorageService storageService: IStorageService,
@IContextKeyService contextKeyService: IContextKeyService,
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
@IContextMenuService private contextMenuService: IContextMenuService,
@IMenuService private menuService: IMenuService,
@IKeybindingService private keybindingService: IKeybindingService,
>>>>>>>
@INextStorage2Service nextStorage2Service: INextStorage2Service,
@IContextKeyService contextKeyService: IContextKeyService,
@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
@IContextMenuService private contextMenuService: IContextMenuService,
@IMenuService private menuService: IMenuService,
@IKeybindingService private keybindingService: IKeybindingService,
<<<<<<<
this.delayedRefresh = new Delayer<void>(500);
this.panelState = this.getMemento(StorageScope.WORKSPACE);
=======
this.panelSettings = this.getMemento(storageService, Scope.WORKSPACE);
>>>>>>>
this.panelState = this.getMemento(StorageScope.WORKSPACE);
<<<<<<<
this.collapseAllAction = this.instantiationService.createInstance(CollapseAllAction, this.tree, true);
this.filterAction = this.instantiationService.createInstance(MarkersFilterAction, { filterText: this.panelState['filter'] || '', filterHistory: this.panelState['filterHistory'] || [], useFilesExclude: !!this.panelState['useFilesExclude'] });
=======
this.collapseAllAction = new Action('vs.tree.collapse', localize('collapse', "Collapse"), 'monaco-tree-action collapse-all', true, async () => {
this.tree.collapseAll();
this.tree.setSelection([]);
this.tree.setFocus([]);
this.tree.getHTMLElement().focus();
this.tree.focusFirst();
});
this.filterAction = this.instantiationService.createInstance(MarkersFilterAction, { filterText: this.panelSettings['filter'] || '', filterHistory: this.panelSettings['filterHistory'] || [], useFilesExclude: !!this.panelSettings['useFilesExclude'] });
>>>>>>>
this.collapseAllAction = new Action('vs.tree.collapse', localize('collapse', "Collapse"), 'monaco-tree-action collapse-all', true, async () => {
this.tree.collapseAll();
this.tree.setSelection([]);
this.tree.setFocus([]);
this.tree.getHTMLElement().focus();
this.tree.focusFirst();
});
this.filterAction = this.instantiationService.createInstance(MarkersFilterAction, { filterText: this.panelState['filter'] || '', filterHistory: this.panelState['filterHistory'] || [], useFilesExclude: !!this.panelState['useFilesExclude'] });
<<<<<<<
protected saveState(): void {
this.panelState['filter'] = this.filterAction.filterText;
this.panelState['filterHistory'] = this.filterAction.filterHistory;
this.panelState['useFilesExclude'] = this.filterAction.useFilesExclude;
=======
getFilterOptions(): FilterOptions {
return this.filter.options;
}
getFilterStats(): { total: number; filtered: number; } {
if (!this.cachedFilterStats) {
this.cachedFilterStats = this.computeFilterStats();
}
return this.cachedFilterStats;
}
private computeFilterStats(): { total: number; filtered: number; } {
const root = this.tree.getNode();
let total = 0;
let filtered = 0;
for (const resourceMarkerNode of root.children) {
for (const markerNode of resourceMarkerNode.children) {
total++;
if (resourceMarkerNode.visible && markerNode.visible) {
filtered++;
}
}
}
return { total, filtered };
}
public shutdown(): void {
// store memento
this.panelSettings['filter'] = this.filterAction.filterText;
this.panelSettings['filterHistory'] = this.filterAction.filterHistory;
this.panelSettings['useFilesExclude'] = this.filterAction.useFilesExclude;
>>>>>>>
getFilterOptions(): FilterOptions {
return this.filter.options;
}
getFilterStats(): { total: number; filtered: number; } {
if (!this.cachedFilterStats) {
this.cachedFilterStats = this.computeFilterStats();
}
return this.cachedFilterStats;
}
private computeFilterStats(): { total: number; filtered: number; } {
const root = this.tree.getNode();
let total = 0;
let filtered = 0;
for (const resourceMarkerNode of root.children) {
for (const markerNode of resourceMarkerNode.children) {
total++;
if (resourceMarkerNode.visible && markerNode.visible) {
filtered++;
}
}
}
return { total, filtered };
}
protected saveState(): void {
this.panelState['filter'] = this.filterAction.filterText;
this.panelState['filterHistory'] = this.filterAction.filterHistory;
this.panelState['useFilesExclude'] = this.filterAction.useFilesExclude; |
<<<<<<<
import { IPanel } from 'vs/workbench/common/panel';
import { IViewlet } from 'vs/workbench/common/viewlet';
import { Viewlet } from 'vs/workbench/browser/viewlet';
=======
import { IPartService } from 'vs/workbench/services/part/common/partService';
>>>>>>>
import { IPanel } from 'vs/workbench/common/panel';
import { IViewlet } from 'vs/workbench/common/viewlet';
import { Viewlet } from 'vs/workbench/browser/viewlet';
import { IPartService } from 'vs/workbench/services/part/common/partService';
<<<<<<<
super(VIEW_ID, telemetryService, themeService);
=======
super(Constants.VIEWLET_ID, partService, telemetryService, themeService);
>>>>>>>
super(VIEW_ID, partService, telemetryService, themeService); |
<<<<<<<
activeTerminalInstanceIndex: number;
configHelper: TerminalConfigHelper;
terminalInstances: ITerminalInstance[];
createInstance(name?: string): ITerminalInstance;
getInstanceFromId(terminalId: number): ITerminalInstance;
getActiveInstance(): ITerminalInstance;
setActiveInstance(terminalInstance: ITerminalInstance): void;
setActiveInstanceByIndex(terminalIndex: number): void;
setActiveInstanceToNext(): void;
setActiveInstanceToPrevious(): void;
showPanel(focus?: boolean): TPromise<void>;
togglePanel(): TPromise<void>;
setContainers(panelContainer: Builder, terminalContainer: HTMLElement): void;
=======
close(): TPromise<any>;
copySelection(): TPromise<any>;
createNew(name?: string, shellPath?: string): TPromise<number>;
focusNext(): TPromise<any>;
focusPrevious(): TPromise<any>;
hide(): TPromise<any>;
hideTerminalInstance(terminalId: number): TPromise<any>;
paste(): TPromise<any>;
runSelectedText(): TPromise<any>;
scrollDown(): TPromise<any>;
scrollUp(): TPromise<any>;
show(focus: boolean): TPromise<ITerminalPanel>;
setActiveTerminal(index: number): TPromise<any>;
setActiveTerminalById(terminalId: number): void;
toggle(): TPromise<any>;
getActiveTerminalIndex(): number;
getTerminalInstanceTitles(): string[];
initConfigHelper(panelContainer: Builder): void;
killTerminalProcess(terminalProcess: ITerminalProcess): void;
>>>>>>>
activeTerminalInstanceIndex: number;
configHelper: TerminalConfigHelper;
terminalInstances: ITerminalInstance[];
createInstance(name?: string, shellPath?: string): ITerminalInstance;
getInstanceFromId(terminalId: number): ITerminalInstance;
getActiveInstance(): ITerminalInstance;
setActiveInstance(terminalInstance: ITerminalInstance): void;
setActiveInstanceByIndex(terminalIndex: number): void;
setActiveInstanceToNext(): void;
setActiveInstanceToPrevious(): void;
showPanel(focus?: boolean): TPromise<void>;
togglePanel(): TPromise<void>;
setContainers(panelContainer: Builder, terminalContainer: HTMLElement): void; |
<<<<<<<
openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean }): TPromise<void> {
=======
openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
>>>>>>>
openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
<<<<<<<
cli: this.environmentService.args,
urisToOpen: paths,
=======
cli: options && options.args ? { ...this.environmentService.args, ...options.args } : this.environmentService.args,
pathsToOpen: paths,
>>>>>>>
urisToOpen: paths,
cli: options && options.args ? { ...this.environmentService.args, ...options.args } : this.environmentService.args, |
<<<<<<<
GetCommitTemplate = 1 << 15,
DeleteBranch = 1 << 16,
Ignore = 1 << 17
=======
GetCommitTemplate = 1 << 15,
Merge = 1 << 16
>>>>>>>
GetCommitTemplate = 1 << 15,
DeleteBranch = 1 << 16,
Merge = 1 << 17,
Ignore = 1 << 18
<<<<<<<
async deleteBranch(name: string, force?: boolean): Promise<void> {
await this.run(Operation.DeleteBranch, () => this.repository.deleteBranch(name, force));
}
=======
async merge(name: string): Promise<void> {
await this.run(Operation.Merge, () => this.repository.merge(name));
}
>>>>>>>
async deleteBranch(name: string, force?: boolean): Promise<void> {
await this.run(Operation.DeleteBranch, () => this.repository.deleteBranch(name, force));
}
async merge(name: string): Promise<void> {
await this.run(Operation.Merge, () => this.repository.merge(name));
} |
<<<<<<<
private async _openResource(model: Model, resource: Resource): Promise<void> {
=======
private async _openResource(resource: Resource, preview?: boolean): Promise<void> {
>>>>>>>
private async _openResource(model: Model, resource: Resource, preview?: boolean): Promise<void> {
<<<<<<<
@modelCommand('git.openFile')
async openFile(model: Model, arg?: Resource | Uri): Promise<void> {
let uri: Uri | undefined;
=======
@command('git.openFile')
async openFile(arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
let uris: Uri[] | undefined;
>>>>>>>
@modelCommand('git.openFile')
async openFile(model: Model, arg?: Resource | Uri, ...resourceStates: SourceControlResourceState[]): Promise<void> {
let uris: Uri[] | undefined;
<<<<<<<
return await this._openResource(model, resource);
=======
const preview = resources.length === 1 ? undefined : false;
for (const resource of resources) {
await this._openResource(resource, preview);
}
>>>>>>>
const preview = resources.length === 1 ? undefined : false;
for (const resource of resources) {
await this._openResource(model, resource, preview);
}
<<<<<<<
const noStagedChanges = model.indexGroup.resources.length === 0;
const noUnstagedChanges = model.workingTreeGroup.resources.length === 0;
=======
const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
const noStagedChanges = this.model.indexGroup.resources.length === 0;
const noUnstagedChanges = this.model.workingTreeGroup.resources.length === 0;
>>>>>>>
const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;
const noStagedChanges = model.indexGroup.resources.length === 0;
const noUnstagedChanges = model.workingTreeGroup.resources.length === 0;
<<<<<<<
@modelCommand('git.commitAll')
async commitAll(model: Model): Promise<void> {
await this.commitWithAnyInput(model, { all: true });
=======
@command('git.commitStagedAmend')
async commitStagedAmend(): Promise<void> {
await this.commitWithAnyInput({ all: false, amend: true });
}
@command('git.commitAll')
async commitAll(): Promise<void> {
await this.commitWithAnyInput({ all: true });
>>>>>>>
@modelCommand('git.commitStagedAmend')
async commitStagedAmend(model: Model): Promise<void> {
await this.commitWithAnyInput(model, { all: false, amend: true });
}
@modelCommand('git.commitAll')
async commitAll(model: Model): Promise<void> {
await this.commitWithAnyInput(model, { all: true });
<<<<<<<
@modelCommand('git.undoCommit')
async undoCommit(model: Model): Promise<void> {
const HEAD = model.HEAD;
=======
@command('git.commitAllAmend')
async commitAllAmend(): Promise<void> {
await this.commitWithAnyInput({ all: true, amend: true });
}
@command('git.undoCommit')
async undoCommit(): Promise<void> {
const HEAD = this.model.HEAD;
>>>>>>>
@modelCommand('git.commitAllAmend')
async commitAllAmend(model: Model): Promise<void> {
await this.commitWithAnyInput(model, { all: true, amend: true });
}
@modelCommand('git.undoCommit')
async undoCommit(model: Model): Promise<void> {
const HEAD = model.HEAD;
<<<<<<<
@modelCommand('git.pullFrom')
async pullFrom(model: Model): Promise<void> {
const remotes = model.remotes;
=======
@command('git.createTag')
async createTag(): Promise<void> {
const inputTagName = await window.showInputBox({
placeHolder: localize('tag name', "Tag name"),
prompt: localize('provide tag name', "Please provide a tag name"),
ignoreFocusOut: true
});
if (!inputTagName) {
return;
}
const inputMessage = await window.showInputBox({
placeHolder: localize('tag message', "Message"),
prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
ignoreFocusOut: true
});
const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
const message = inputMessage || name;
await this.model.tag(name, message);
}
@command('git.pullFrom')
async pullFrom(): Promise<void> {
const remotes = this.model.remotes;
>>>>>>>
@modelCommand('git.createTag')
async createTag(model: Model): Promise<void> {
const inputTagName = await window.showInputBox({
placeHolder: localize('tag name', "Tag name"),
prompt: localize('provide tag name', "Please provide a tag name"),
ignoreFocusOut: true
});
if (!inputTagName) {
return;
}
const inputMessage = await window.showInputBox({
placeHolder: localize('tag message', "Message"),
prompt: localize('provide tag message', "Please provide a message to annotate the tag"),
ignoreFocusOut: true
});
const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
const message = inputMessage || name;
await model.tag(name, message);
}
@modelCommand('git.pullFrom')
async pullFrom(model: Model): Promise<void> {
const remotes = model.remotes;
<<<<<<<
@modelCommand('git.pushTo')
async pushTo(model: Model): Promise<void> {
const remotes = model.remotes;
=======
@command('git.pushWithTags')
async pushWithTags(): Promise<void> {
const remotes = this.model.remotes;
if (remotes.length === 0) {
window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
return;
}
await this.model.pushTags();
window.showInformationMessage(localize('push with tags success', "Successfully pushed with tags."));
}
@command('git.pushTo')
async pushTo(): Promise<void> {
const remotes = this.model.remotes;
>>>>>>>
@modelCommand('git.pushWithTags')
async pushWithTags(model: Model): Promise<void> {
const remotes = model.remotes;
if (remotes.length === 0) {
window.showWarningMessage(localize('no remotes to push', "Your repository has no remotes configured to push to."));
return;
}
await model.pushTags();
window.showInformationMessage(localize('push with tags success', "Successfully pushed with tags."));
}
@modelCommand('git.pushTo')
async pushTo(model: Model): Promise<void> {
const remotes = model.remotes; |
<<<<<<<
import {EditorStacksModel, EditorGroup, IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
=======
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
>>>>>>>
import {EditorStacksModel, EditorGroup, IEditorIdentifier} from 'vs/workbench/common/editor/editorStacksModel';
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
<<<<<<<
=======
private visibleInputListeners: IDisposable[];
>>>>>>>
<<<<<<<
private visibleEditorListeners: Function[][];
=======
private visibleEditorListeners: IDisposable[][];
>>>>>>>
private visibleEditorListeners: IDisposable[][];
<<<<<<<
return instantiateEditorPromise;
}
=======
// Register as Emitter to Workbench Bus
this.visibleEditorListeners[position].push(this.eventService.addEmitter2(this.visibleEditors[position], this.visibleEditors[position].getId()));
>>>>>>>
return instantiateEditorPromise;
}
<<<<<<<
return lastActiveEditor ? lastActiveEditor.input : null;
}
public getActiveEditor(): BaseEditor {
if (!this.sideBySideControl) {
return null; // too early
}
=======
// Clear Listeners
this.visibleEditorListeners[position] = dispose(this.visibleEditorListeners[position]);
>>>>>>>
return lastActiveEditor ? lastActiveEditor.input : null;
}
public getActiveEditor(): BaseEditor {
if (!this.sideBySideControl) {
return null; // too early
}
<<<<<<<
const focusListener = this.sideBySideControl.onGroupFocusChanged(() => this.onGroupFocusChanged());
this.toUnbind.push(() => focusListener.dispose());
const titleClickListener = this.sideBySideControl.onEditorTitleDoubleclick((position) => this.onEditorTitleDoubleclick(position));
this.toUnbind.push(() => titleClickListener.dispose());
=======
this.toUnbind.push(this.sideBySideControl.addListener2(SideBySideEventType.EDITOR_FOCUS_CHANGED, () => { this.onEditorFocusChanged(); }));
>>>>>>>
this.toUnbind.push(this.sideBySideControl.onGroupFocusChanged(() => this.onGroupFocusChanged()));
this.toUnbind.push(this.sideBySideControl.onEditorTitleDoubleclick((position) => this.onEditorTitleDoubleclick(position)));
<<<<<<<
=======
// Input listeners
for (let i = 0; i < this.visibleInputListeners.length; i++) {
let listener = this.visibleInputListeners[i];
if (listener) {
listener.dispose();
}
this.visibleInputListeners = [];
}
>>>>>>> |
<<<<<<<
import { ModelLine, ILineEdit, LineMarker, MarkersTracker } from 'vs/editor/common/model/modelLine';
import { MetadataConsts, LanguageIdentifier } from 'vs/editor/common/modes';
import { Position } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
=======
import { ModelLine, ILineEdit, computeIndentLevel } from 'vs/editor/common/model/modelLine';
import { MetadataConsts } from 'vs/editor/common/modes';
>>>>>>>
import { ModelLine, ILineEdit, computeIndentLevel } from 'vs/editor/common/model/modelLine';
import { MetadataConsts, LanguageIdentifier } from 'vs/editor/common/modes';
import { Range } from 'vs/editor/common/core/range';
<<<<<<<
let tmp = TestToken.toTokens(_expected);
LineTokens.convertToEndOffset(tmp, _actual.getLineLength());
let expected = ViewLineTokenFactory.inflateArr(tmp);
=======
let expected = ViewLineTokenFactory.inflateArr(TestToken.toTokens(_expected), _actual.getLineContent().length);
>>>>>>>
let tmp = TestToken.toTokens(_expected);
LineTokens.convertToEndOffset(tmp, _actual.getLineContent().length);
let expected = ViewLineTokenFactory.inflateArr(tmp);
<<<<<<<
testApplyEdits(
[{
text: initialText,
tokens: initialTokens
}],
[{
range: new Range(1, splitColumn, 1, splitColumn),
text: '\n'
}],
[{
text: expectedText1,
tokens: expectedTokens
}, {
text: expectedText2,
tokens: [new TestToken(0, 1)]
}]
);
=======
let line = new ModelLine(initialText);
line.setTokens(0, TestToken.toTokens(initialTokens));
let other = line.split(splitColumn);
assert.equal(line.text, expectedText1);
assert.equal(other.text, expectedText2);
assertLineTokens(line.getTokens(0), expectedTokens);
>>>>>>>
testApplyEdits(
[{
text: initialText,
tokens: initialTokens
}],
[{
range: new Range(1, splitColumn, 1, splitColumn),
text: '\n'
}],
[{
text: expectedText1,
tokens: expectedTokens
}, {
text: expectedText2,
tokens: [new TestToken(0, 1)]
}]
);
<<<<<<<
testApplyEdits(
[{
text: aText,
tokens: aTokens
}, {
text: bText,
tokens: bTokens
}],
[{
range: new Range(1, aText.length + 1, 2, 1),
text: ''
}],
[{
text: expectedText,
tokens: expectedTokens
}]
);
=======
let a = new ModelLine(aText);
a.setTokens(0, TestToken.toTokens(aTokens));
let b = new ModelLine(bText);
b.setTokens(0, TestToken.toTokens(bTokens));
a.append(b);
assert.equal(a.text, expectedText);
assertLineTokens(a.getTokens(0), expectedTokens);
>>>>>>>
testApplyEdits(
[{
text: aText,
tokens: aTokens
}, {
text: bText,
tokens: bTokens
}],
[{
range: new Range(1, aText.length + 1, 2, 1),
text: ''
}],
[{
text: expectedText,
tokens: expectedTokens
}]
); |
<<<<<<<
this._styleSheet = dom.createStyleSheet();
this._decorationOptionProviders = Object.create(null);
=======
this._styleSheet = styleSheet;
this._decorationRenderOptions = Object.create(null);
>>>>>>>
this._styleSheet = styleSheet;
this._decorationOptionProviders = Object.create(null);
<<<<<<<
contentText: 'content:\'{0}\';',
contentIconPath: 'content:url(\'{0}\')',
margin: 'margin:{0};',
width: 'width:{0};',
height: 'height:{0};'
=======
gutterIconSize: 'background-size:{0};',
>>>>>>>
gutterIconSize: 'background-size:{0};',
contentText: 'content:\'{0}\';',
contentIconPath: 'content:url(\'{0}\')',
margin: 'margin:{0};',
width: 'width:{0};',
height: 'height:{0};' |
<<<<<<<
private REFRESH_SUBSCRIPTION_DELAY: number = 10000;
private isOnline: boolean = false;
=======
>>>>>>>
<<<<<<<
this.node = { key, ...node };
this.nodeService.setCurrentNode(this.node);
this.loadData();
}
private loadData(): void
{
this.nodeService.nodeApps().subscribe(apps => this.nodeApps = apps);
this.nodeService.nodeInfo().subscribe(this.onNodeInfoReceived.bind(this));
}
onNodeInfoReceived(info: NodeInfo)
{
this.nodeInfo = info;
this.transports = info.transports || [];
this.setOnlineStatus();
}
/**
* Node is online if at least one discovery is seeing it.
*/
private setOnlineStatus()
{
this.isOnline = false;
Object.keys(this.nodeInfo.discoveries).map((discovery) =>
{
this.isOnline = this.isOnline || this.nodeInfo.discoveries[discovery];
});
}
=======
>>>>>>> |
<<<<<<<
test('Transform -> FormatString#resolve', function () {
// shorthand functions
assert.equal(new FormatString(1, 'upcase').resolve('foo'), 'FOO');
assert.equal(new FormatString(1, 'downcase').resolve('FOO'), 'foo');
assert.equal(new FormatString(1, 'capitalize').resolve('bar'), 'Bar');
assert.equal(new FormatString(1, 'capitalize').resolve('bar no repeat'), 'Bar no repeat');
assert.equal(new FormatString(1, 'notKnown').resolve('input'), 'input');
// if
assert.equal(new FormatString(1, undefined, 'foo', undefined).resolve(undefined), '');
assert.equal(new FormatString(1, undefined, 'foo', undefined).resolve(''), '');
assert.equal(new FormatString(1, undefined, 'foo', undefined).resolve('bar'), 'foo');
// else
assert.equal(new FormatString(1, undefined, undefined, 'foo').resolve(undefined), 'foo');
assert.equal(new FormatString(1, undefined, undefined, 'foo').resolve(''), 'foo');
assert.equal(new FormatString(1, undefined, undefined, 'foo').resolve('bar'), 'bar');
// if-else
assert.equal(new FormatString(1, undefined, 'bar', 'foo').resolve(undefined), 'foo');
assert.equal(new FormatString(1, undefined, 'bar', 'foo').resolve(''), 'foo');
assert.equal(new FormatString(1, undefined, 'bar', 'foo').resolve('baz'), 'bar');
});
=======
test('[BUG] HTML attribute suggestions: Snippet session does not have end-position set, #33147', function () {
const { placeholders } = new SnippetParser().parse('src="$1"', true);
const [first, second] = placeholders;
assert.equal(placeholders.length, 2);
assert.equal(first.index, 1);
assert.equal(second.index, 0);
});
>>>>>>>
test('Transform -> FormatString#resolve', function () {
// shorthand functions
assert.equal(new FormatString(1, 'upcase').resolve('foo'), 'FOO');
assert.equal(new FormatString(1, 'downcase').resolve('FOO'), 'foo');
assert.equal(new FormatString(1, 'capitalize').resolve('bar'), 'Bar');
assert.equal(new FormatString(1, 'capitalize').resolve('bar no repeat'), 'Bar no repeat');
assert.equal(new FormatString(1, 'notKnown').resolve('input'), 'input');
// if
assert.equal(new FormatString(1, undefined, 'foo', undefined).resolve(undefined), '');
assert.equal(new FormatString(1, undefined, 'foo', undefined).resolve(''), '');
assert.equal(new FormatString(1, undefined, 'foo', undefined).resolve('bar'), 'foo');
// else
assert.equal(new FormatString(1, undefined, undefined, 'foo').resolve(undefined), 'foo');
assert.equal(new FormatString(1, undefined, undefined, 'foo').resolve(''), 'foo');
assert.equal(new FormatString(1, undefined, undefined, 'foo').resolve('bar'), 'bar');
// if-else
assert.equal(new FormatString(1, undefined, 'bar', 'foo').resolve(undefined), 'foo');
assert.equal(new FormatString(1, undefined, 'bar', 'foo').resolve(''), 'foo');
assert.equal(new FormatString(1, undefined, 'bar', 'foo').resolve('baz'), 'bar');
});
test('[BUG] HTML attribute suggestions: Snippet session does not have end-position set, #33147', function () {
const { placeholders } = new SnippetParser().parse('src="$1"', true);
const [first, second] = placeholders;
assert.equal(placeholders.length, 2);
assert.equal(first.index, 1);
assert.equal(second.index, 0);
}); |
<<<<<<<
import { TextBuffer } from 'vs/editor/common/model/textBuffer';
import { TextBuffer as TextBuffer2 } from 'vs/editor/common/model/textBuffer2';
import { IRawPTBuffer } from './textSource';
=======
import { ITextBuffer } from 'vs/editor/common/model/textBuffer';
>>>>>>>
import { ITextBuffer } from 'vs/editor/common/model/textBuffer';
import { TextBuffer as TextBuffer2 } from 'vs/editor/common/model/textBuffer2';
import { IRawPTBuffer } from './textSource';
<<<<<<<
private readonly _buffer: TextBuffer | TextBuffer2
=======
private readonly _buffer: ITextBuffer
>>>>>>>
private readonly _buffer: ITextBuffer | TextBuffer2 |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
=======
import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
>>>>>>>
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
<<<<<<<
@IInstantiationService private instantiationService: IInstantiationService
=======
@IContextKeyService private contextKeyService: IContextKeyService,
@IListService private listService: IListService,
@IInstantiationService private instantiationService: IInstantiationService,
@IThemeService private themeService: IThemeService,
@IConfigurationService protected readonly configurationService: IConfigurationService,
>>>>>>>
@IInstantiationService private instantiationService: IInstantiationService,
@IConfigurationService configurationService: IConfigurationService |
<<<<<<<
async deleteBranch(name: string, force?: boolean): Promise<void> {
const args = ['branch', force ? '-D' : '-d', name];
await this.run(args);
}
=======
async merge(name: string): Promise<void> {
const args = ['merge', name];
await this.run(args);
}
>>>>>>>
async deleteBranch(name: string, force?: boolean): Promise<void> {
const args = ['branch', force ? '-D' : '-d', name];
await this.run(args);
}
async merge(name: string): Promise<void> {
const args = ['merge', name];
await this.run(args);
} |
<<<<<<<
.registerChannel(ExtensionsLabel);
Registry.as<IEditorRegistry>(EditorExtensions.Editors)
.registerEditorInputFactory(ExtensionsInput.ID, ExtensionsInputFactory);
const editorDescriptor = new EditorDescriptor(
ExtensionsPart.ID,
localize('extensions', "Extensions"),
'vs/workbench/parts/extensions/electron-browser/extensionsPart',
'ExtensionsPart'
);
Registry.as<IEditorRegistry>(EditorExtensions.Editors)
.registerEditor(editorDescriptor, [new SyncDescriptor(ExtensionsInput)]);
Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar)
.registerActionBarContributor(ActionBarScope.GLOBAL, GlobalExtensionsActionContributor);
=======
.registerChannel(ExtensionsChannelId, ExtensionsLabel);
>>>>>>>
.registerChannel(ExtensionsChannelId, ExtensionsLabel);
Registry.as<IEditorRegistry>(EditorExtensions.Editors)
.registerEditorInputFactory(ExtensionsInput.ID, ExtensionsInputFactory);
const editorDescriptor = new EditorDescriptor(
ExtensionsPart.ID,
localize('extensions', "Extensions"),
'vs/workbench/parts/extensions/electron-browser/extensionsPart',
'ExtensionsPart'
);
Registry.as<IEditorRegistry>(EditorExtensions.Editors)
.registerEditor(editorDescriptor, [new SyncDescriptor(ExtensionsInput)]);
Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar)
.registerActionBarContributor(ActionBarScope.GLOBAL, GlobalExtensionsActionContributor); |
<<<<<<<
import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/common/tree';
=======
import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/browser/tree';
import {WorkbenchComponent} from 'vs/workbench/common/component';
import {ViewletEvent} from 'vs/workbench/common/events';
>>>>>>>
import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/browser/tree'; |
<<<<<<<
import { LinkedMap as Map } from 'vs/base/common/map';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
=======
>>>>>>>
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
<<<<<<<
import { EditorOptions, EditorInput } from 'vs/workbench/common/editor';
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
=======
import { EditorOptions, asFileEditorInput } from 'vs/workbench/common/editor';
>>>>>>>
import { EditorOptions, toResource } from 'vs/workbench/common/editor';
<<<<<<<
DEFAULT_EDITOR_COMMAND_COLLAPSE_ALL, DEFAULT_EDITOR_COMMAND_FOCUS_SEARCH
=======
DEFAULT_EDITOR_COMMAND_COLLAPSE_ALL, ISettingsEditorModel
>>>>>>>
DEFAULT_EDITOR_COMMAND_COLLAPSE_ALL, DEFAULT_EDITOR_COMMAND_FOCUS_SEARCH, ISettingsEditorModel
<<<<<<<
=======
import { IEventService } from 'vs/platform/event/common/event';
import { IMessageService, Severity } from 'vs/platform/message/common/message';
>>>>>>>
import { IMessageService, Severity } from 'vs/platform/message/common/message';
<<<<<<<
private inputDisposeListener: IDisposable;
=======
>>>>>>>
<<<<<<<
render(): void;
dispose(): void;
=======
render();
updatePreference(setting: ISetting, value: any): void;
dispose();
>>>>>>>
render();
updatePreference(setting: ISetting, value: any): void;
dispose();
<<<<<<<
this.focusNextSettingRenderer.render([]);
=======
this.hiddenAreasRenderer.render();
this.filteredSettingsNavigationRenderer.render([]);
>>>>>>>
this.hiddenAreasRenderer.render();
this.filteredSettingsNavigationRenderer.render([]); |
<<<<<<<
import { FooterComponent } from './components/layout/footer/footer.component';
import { AppsComponent } from './components/pages/node/apps/apps.component';
import { LogComponent } from './components/pages/node/apps/log/log.component';
import { AppSshsComponent } from './components/pages/node/apps/app-sshs/app-sshs.component';
import { SshsStartupComponent } from './components/pages/node/apps/app-sshs/sshs-startup/sshs-startup.component';
import { SshsWhitelistComponent } from './components/pages/node/apps/app-sshs/sshs-whitelist/sshs-whitelist.component';
import { AppSshcComponent } from './components/pages/node/apps/app-sshc/app-sshc.component';
import { SshcStartupComponent } from './components/pages/node/apps/app-sshc/sshc-startup/sshc-startup.component';
import { SshcKeysComponent } from './components/pages/node/apps/app-sshc/sshc-keys/sshc-keys.component';
import { KeypairComponent } from './components/layout/keypair/keypair.component';
import { AppSockscComponent } from './components/pages/node/apps/app-socksc/app-socksc.component';
import { SockscConnectComponent } from './components/pages/node/apps/app-socksc/socksc-connect/socksc-connect.component';
import { SockscStartupComponent } from './components/pages/node/apps/app-socksc/socksc-startup/socksc-startup.component';
=======
>>>>>>>
import { AppsComponent } from './components/pages/node/apps/apps.component';
import { LogComponent } from './components/pages/node/apps/log/log.component';
import { AppSshsComponent } from './components/pages/node/apps/app-sshs/app-sshs.component';
import { SshsStartupComponent } from './components/pages/node/apps/app-sshs/sshs-startup/sshs-startup.component';
import { SshsWhitelistComponent } from './components/pages/node/apps/app-sshs/sshs-whitelist/sshs-whitelist.component';
import { AppSshcComponent } from './components/pages/node/apps/app-sshc/app-sshc.component';
import { SshcStartupComponent } from './components/pages/node/apps/app-sshc/sshc-startup/sshc-startup.component';
import { SshcKeysComponent } from './components/pages/node/apps/app-sshc/sshc-keys/sshc-keys.component';
import { KeypairComponent } from './components/layout/keypair/keypair.component';
import { AppSockscComponent } from './components/pages/node/apps/app-socksc/app-socksc.component';
import { SockscConnectComponent } from './components/pages/node/apps/app-socksc/socksc-connect/socksc-connect.component';
import { SockscStartupComponent } from './components/pages/node/apps/app-socksc/socksc-startup/socksc-startup.component';
<<<<<<<
AppsComponent,
LogComponent,
AppSshsComponent,
SshsStartupComponent,
SshsWhitelistComponent,
AppSshcComponent,
SshcStartupComponent,
SshcKeysComponent,
KeypairComponent,
AppSockscComponent,
SockscConnectComponent,
SockscStartupComponent,
=======
NodeTransportsList,
NodeAppsListComponent,
CopyToClipboardTextComponent
>>>>>>>
AppsComponent,
LogComponent,
AppSshsComponent,
SshsStartupComponent,
SshsWhitelistComponent,
AppSshcComponent,
SshcStartupComponent,
SshcKeysComponent,
KeypairComponent,
AppSockscComponent,
SockscConnectComponent,
SockscStartupComponent,
NodeTransportsList,
NodeAppsListComponent,
CopyToClipboardTextComponent
<<<<<<<
TerminalComponent,
LogComponent,
SshsStartupComponent,
SshsWhitelistComponent,
SshcKeysComponent,
SshcStartupComponent,
SockscConnectComponent,
SockscStartupComponent,
=======
TerminalComponent
>>>>>>>
TerminalComponent,
LogComponent,
SshsStartupComponent,
SshsWhitelistComponent,
SshcKeysComponent,
SshcStartupComponent,
SockscConnectComponent,
SockscStartupComponent,
<<<<<<<
MatSlideToggleModule,
=======
MatTooltipModule,
MatChipsModule,
MatMenuModule,
MatSnackBarModule,
MatIconModule
>>>>>>>
MatSlideToggleModule,
MatTooltipModule,
MatChipsModule,
MatMenuModule,
MatSnackBarModule,
MatIconModule |
<<<<<<<
openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void> {
=======
openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> {
>>>>>>>
openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void> { |
<<<<<<<
provideCodeActions(resource: URI, range: IRange): TPromise<CodeActionDto[]> {
=======
provideCodeActions(resource: URI, range: IRange, context: modes.CodeActionContext): TPromise<modes.CodeAction[]> {
>>>>>>>
provideCodeActions(resource: URI, range: IRange, context: modes.CodeActionContext): TPromise<CodeActionDto[]> {
<<<<<<<
$provideCodeActions(handle: number, resource: UriComponents, range: IRange): TPromise<CodeActionDto[]> {
return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), range));
=======
$provideCodeActions(handle: number, resource: UriComponents, range: IRange, context: modes.CodeActionContext): TPromise<modes.CodeAction[]> {
return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), range, context));
>>>>>>>
$provideCodeActions(handle: number, resource: UriComponents, range: IRange, context: modes.CodeActionContext): TPromise<CodeActionDto[]> {
return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), range, context)); |
<<<<<<<
openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void>;
=======
openWindow(windowId: number, paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>;
>>>>>>>
openWindow(windowId: number, paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>;
<<<<<<<
openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean; }): TPromise<void>;
=======
openWindow(paths: string[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>;
>>>>>>>
openWindow(paths: URI[], options?: { forceNewWindow?: boolean, forceReuseWindow?: boolean, forceOpenWorkspaceAsFile?: boolean, args?: ParsedArgs }): TPromise<void>; |
<<<<<<<
public resolve(refresh?: boolean): TPromise<IEditorModel> {
=======
public resolve(): TPromise<IEditorModel, any> {
>>>>>>>
public resolve(): TPromise<IEditorModel> { |
<<<<<<<
import { IMessageService } from "vs/platform/message/common/message";
=======
import * as nls from 'vs/nls';
import * as browser from 'vs/base/browser/browser';
>>>>>>>
import { IMessageService } from "vs/platform/message/common/message";
import * as nls from 'vs/nls';
import * as browser from 'vs/base/browser/browser'; |
<<<<<<<
private nodeService: NodeService,
) {
this.discoveries = data.discoveries;
this.discovery = this.discoveries[0];
}
ngOnInit() {
}
search() {
this.nodeService.searchServices(this.serviceKey, this.currentPage, this.limit, this.discovery)
.subscribe((result: SearchResult) => {
this.results = result.result;
this.count = result.count;
this.pages = Math.floor(this.count / this.limit);
});
}
=======
private dialogRef: MatDialogRef<SockscConnectComponent>
) {}
>>>>>>>
) { } |
<<<<<<<
registerWebviewPanelSerializer: proposedApiFunction(extension, (viewType: string, serializer: vscode.WebviewPanelSerializer) => {
return extHostWebviews.registerWebviewPanelSerializer(viewType, serializer);
}),
registerUriHandler(handler: vscode.UriHandler) {
return extHostUrls.registerUriHandler(extension.id, handler);
},
=======
registerProtocolHandler: proposedApiFunction(extension, (handler: vscode.ProtocolHandler) => {
return extHostUrls.registerProtocolHandler(extension.id, handler);
}),
>>>>>>>
registerUriHandler(handler: vscode.UriHandler) {
return extHostUrls.registerUriHandler(extension.id, handler);
}, |
<<<<<<<
import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
=======
import { clamp } from 'vs/base/common/numbers';
>>>>>>>
import { CombinedSpliceable } from 'vs/base/browser/ui/list/splice';
import { clamp } from 'vs/base/common/numbers'; |
<<<<<<<
import { getWorkspaceLabel, IWorkspacesService, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IStoredWorkspaceFolder, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
=======
import { getWorkspaceLabel, IWorkspacesService, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
>>>>>>>
import { getWorkspaceLabel, IWorkspacesService, IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IStoredWorkspaceFolder, isWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
import { IJSONSchema } from 'vs/base/common/jsonSchema'; |
<<<<<<<
stickiness?: TrackedRangeStickiness;
backgroundColor?: string;
=======
backgroundColor?: string | ThemeColor;
>>>>>>>
stickiness?: TrackedRangeStickiness;
backgroundColor?: string | ThemeColor; |
<<<<<<<
windowsService.open({ cli: environmentService.args, forceNewWindow: true, forceEmpty: true, restoreBackups: true }); // new window if "-n" was used without paths
=======
windowsMainService.open({ cli: environmentService.args, forceNewWindow: true, forceEmpty: true }); // new window if "-n" was used without paths
>>>>>>>
windowsMainService.open({ cli: environmentService.args, forceNewWindow: true, forceEmpty: true, restoreBackups: true }); // new window if "-n" was used without paths |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { OpenMode } from 'vs/base/parts/tree/browser/treeDefaults';
=======
import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
>>>>>>>
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { OpenMode } from 'vs/base/parts/tree/browser/treeDefaults';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
<<<<<<<
@IInstantiationService private instantiationService: IInstantiationService
=======
@IInstantiationService private instantiationService: IInstantiationService,
@IListService private listService: IListService,
@IContextKeyService private contextKeyService: IContextKeyService,
@IThemeService private themeService: IThemeService,
@IConfigurationService protected readonly configurationService: IConfigurationService,
>>>>>>>
@IInstantiationService private instantiationService: IInstantiationService,
@IConfigurationService configurationService: IConfigurationService |
<<<<<<<
import { once } from 'vs/base/common/event';
import { domEvent } from 'vs/base/browser/event';
import { append, emmet as $, addClass, removeClass, finalHandler } from 'vs/base/browser/dom';
=======
import { append, $, addClass, removeClass, finalHandler } from 'vs/base/browser/dom';
>>>>>>>
import { once } from 'vs/base/common/event';
import { domEvent } from 'vs/base/browser/event';
import { append, $, addClass, removeClass, finalHandler } from 'vs/base/browser/dom'; |
<<<<<<<
return this._proxy.$deserializeWebviewPanel(handle, webview.state.viewType, webview.getTitle(), webview.state.state, webview.group, webview.options) // TODO@grid [EXTENSIONS] adopt group identifier
=======
let state;
try {
state = JSON.parse(webview.state.state);
} catch {
state = {};
}
return this._proxy.$deserializeWebviewPanel(handle, webview.state.viewType, webview.getTitle(), state, webview.position, webview.options)
>>>>>>>
let state;
try {
state = JSON.parse(webview.state.state);
} catch {
state = {};
}
return this._proxy.$deserializeWebviewPanel(handle, webview.state.viewType, webview.getTitle(), state, webview.group, webview.options) // TODO@grid [EXTENSIONS] adopt group identifier |
<<<<<<<
import * as editorCommon from 'vs/editor/common/editorCommon';
import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget, IndentationGuesserRawTextBufferTarget } from 'vs/editor/common/model/indentationGuesser';
=======
import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged } from 'vs/editor/common/model/textModelEvents';
import { onUnexpectedError } from 'vs/base/common/errors';
import { IMarkdownString } from 'vs/base/common/htmlContent';
import * as strings from 'vs/base/common/strings';
import { CharCode } from 'vs/base/common/charCode';
import { ThemeColor } from 'vs/platform/theme/common/themeService';
import { IntervalNode, IntervalTree, recomputeMaxEnd, getNodeIsInOverviewRuler } from 'vs/editor/common/model/intervalTree';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { StopWatch } from 'vs/base/common/stopwatch';
import { NULL_LANGUAGE_IDENTIFIER } from 'vs/editor/common/modes/nullMode';
import { ignoreBracketsInToken } from 'vs/editor/common/modes/supports';
import { BracketsUtils, RichEditBrackets, RichEditBracket } from 'vs/editor/common/modes/supports/richEditBrackets';
import { Position, IPosition } from 'vs/editor/common/core/position';
import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
import { LineTokens } from 'vs/editor/common/core/lineTokens';
import { getWordAtText } from 'vs/editor/common/model/wordHelper';
import { ModelLinesTokens, computeIndentLevel, ModelTokensChangedEventBuilder } from 'vs/editor/common/model/modelLine';
import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget } from 'vs/editor/common/model/indentationGuesser';
>>>>>>>
import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged } from 'vs/editor/common/model/textModelEvents';
import { onUnexpectedError } from 'vs/base/common/errors';
import { IMarkdownString } from 'vs/base/common/htmlContent';
import * as strings from 'vs/base/common/strings';
import { CharCode } from 'vs/base/common/charCode';
import { ThemeColor } from 'vs/platform/theme/common/themeService';
import { IntervalNode, IntervalTree, recomputeMaxEnd, getNodeIsInOverviewRuler } from 'vs/editor/common/model/intervalTree';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { StopWatch } from 'vs/base/common/stopwatch';
import { NULL_LANGUAGE_IDENTIFIER } from 'vs/editor/common/modes/nullMode';
import { ignoreBracketsInToken } from 'vs/editor/common/modes/supports';
import { BracketsUtils, RichEditBrackets, RichEditBracket } from 'vs/editor/common/modes/supports/richEditBrackets';
import { Position, IPosition } from 'vs/editor/common/core/position';
import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
import { LineTokens } from 'vs/editor/common/core/lineTokens';
import { getWordAtText } from 'vs/editor/common/model/wordHelper';
import { ModelLinesTokens, computeIndentLevel, ModelTokensChangedEventBuilder } from 'vs/editor/common/model/modelLine';
import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget, IndentationGuesserRawTextBufferTarget } from 'vs/editor/common/model/indentationGuesser';
<<<<<<<
import { TextSource, ITextSource, IRawTextSource, RawTextSource } from 'vs/editor/common/model/textSource';
import { IModelContentChangedEvent, ModelRawContentChangedEvent, ModelRawFlush, ModelRawEOLChanged, IModelOptionsChangedEvent, InternalModelContentChangeEvent } from 'vs/editor/common/model/textModelEvents';
import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
// import { TextBuffer } from 'vs/editor/common/model/textBuffer';
import { TextBuffer } from 'vs/editor/common/model/textBuffer2';
=======
import { TextBuffer, ITextBuffer } from 'vs/editor/common/model/textBuffer';
var MODEL_ID = 0;
/**
* Produces 'a'-'z', followed by 'A'-'Z'... followed by 'a'-'z', etc.
*/
function singleLetter(result: number): string {
const LETTERS_CNT = (CharCode.Z - CharCode.A + 1);
result = result % (2 * LETTERS_CNT);
if (result < LETTERS_CNT) {
return String.fromCharCode(CharCode.a + result);
}
return String.fromCharCode(CharCode.A + result - LETTERS_CNT);
}
>>>>>>>
import { TextBuffer, ITextBuffer } from 'vs/editor/common/model/textBuffer';
// import { TextBuffer } from 'vs/editor/common/model/textBuffer2';
var MODEL_ID = 0;
/**
* Produces 'a'-'z', followed by 'A'-'Z'... followed by 'a'-'z', etc.
*/
function singleLetter(result: number): string {
const LETTERS_CNT = (CharCode.Z - CharCode.A + 1);
result = result % (2 * LETTERS_CNT);
if (result < LETTERS_CNT) {
return String.fromCharCode(CharCode.a + result);
}
return String.fromCharCode(CharCode.A + result - LETTERS_CNT);
}
<<<<<<<
const guessedIndentation = guessIndentation(
Array.isArray(textSource.lines) ?
new IndentationGuesserStringArrayTarget(textSource.lines) :
new IndentationGuesserRawTextBufferTarget(textSource.lines),
options.tabSize,
options.insertSpaces
);
resolvedOpts = new editorCommon.TextModelResolvedOptions({
=======
const guessedIndentation = guessIndentation(new IndentationGuesserStringArrayTarget(textSource.lines), options.tabSize, options.insertSpaces);
resolvedOpts = new model.TextModelResolvedOptions({
>>>>>>>
const guessedIndentation = guessIndentation(
Array.isArray(textSource.lines) ?
new IndentationGuesserStringArrayTarget(textSource.lines) :
new IndentationGuesserRawTextBufferTarget(textSource.lines),
options.tabSize,
options.insertSpaces
);
resolvedOpts = new model.TextModelResolvedOptions({ |
<<<<<<<
private getConflictsOrEmpty(document: vscode.TextDocument): interfaces.IDocumentMergeConflict[] {
=======
private getConflictsOrEmpty(document: vscode.TextDocument, origins: string[]): interfaces.IDocumentMergeConflict[] {
let stepStart = process.hrtime();
>>>>>>>
private getConflictsOrEmpty(document: vscode.TextDocument, origins: string[]): interfaces.IDocumentMergeConflict[] {
<<<<<<<
=======
let stepEnd = process.hrtime(stepStart);
console.info('[%s] %s -> Check document execution time: %dms', origins.join(', '), document.uri.toString(), stepEnd[1] / 1000000);
>>>>>>>
<<<<<<<
=======
stepEnd = process.hrtime(stepStart);
console.info('[%s] %s -> Find conflict regions execution time: %dms', origins.join(', '), document.uri.toString(), stepEnd[1] / 1000000);
>>>>>>> |
<<<<<<<
import { ICommonCodeEditor, isCommonCodeEditor } from 'vs/editor/common/editorCommon';
import { bulkEdit, IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { TPromise } from 'vs/base/common/winjs.base';
=======
import { TPromise, PPromise } from 'vs/base/common/winjs.base';
>>>>>>>
import { TPromise } from 'vs/base/common/winjs.base';
<<<<<<<
@IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService,
@ITextModelService private readonly _textModelResolverService: ITextModelService,
@IExperimentService private _experimentService: IExperimentService,
=======
@IExperimentService private experimentService: IExperimentService,
>>>>>>>
@IExperimentService private _experimentService: IExperimentService, |
<<<<<<<
import { AccountID, Asset, AssetCode, AssetID, IAssetInput } from "../";
=======
import { AccountID, Asset, AssetCode, AssetID } from "../";
import { HorizonAssetType } from "../../datasource/types";
>>>>>>>
import { AccountID, Asset, AssetCode, AssetID } from "../";
<<<<<<<
public static fromInput(arg: IAssetInput) {
if (arg.issuer && arg.code) {
return new stellar.Asset(arg.code, arg.issuer);
}
return stellar.Asset.native();
}
=======
public static fromHorizon(type: HorizonAssetType, code?: string, issuer?: string) {
return type === "native" ? stellar.Asset.native() : new stellar.Asset(code!, issuer!);
}
>>>>>>> |
<<<<<<<
=======
export interface PushOptions {
setUpstream?: boolean;
withTags?: boolean;
}
>>>>>>>
<<<<<<<
async deleteBranch(name: string, force?: boolean): Promise<void> {
const args = ['branch', force ? '-D' : '-d', name];
await this.run(args);
}
async merge(ref: string): Promise<void> {
const args = ['merge', ref];
try {
await this.run(args);
} catch (err) {
if (/^CONFLICT /m.test(err.stdout || '')) {
err.gitErrorCode = GitErrorCodes.Conflict;
}
throw err;
}
}
=======
async show(ref: string): Promise<string> {
let args = ['show', '-s', '--format=%H\n%B', ref];
const result = await this.run(args);
if (!result) {
return Promise.reject<string>('Invalid reference provided.');
}
return result.stdout;
}
async tag(name: string, message: string, lightweight: boolean): Promise<void> {
let args = ['tag'];
if (lightweight) {
args.push(name);
} else {
args = args.concat(['-a', name, '-m', message]);
}
await this.run(args);
}
>>>>>>>
async deleteBranch(name: string, force?: boolean): Promise<void> {
const args = ['branch', force ? '-D' : '-d', name];
await this.run(args);
}
async merge(ref: string): Promise<void> {
const args = ['merge', ref];
try {
await this.run(args);
} catch (err) {
if (/^CONFLICT /m.test(err.stdout || '')) {
err.gitErrorCode = GitErrorCodes.Conflict;
}
throw err;
}
}
async tag(name: string, message: string, lightweight: boolean): Promise<void> {
let args = ['tag'];
if (lightweight) {
args.push(name);
} else {
args = args.concat(['-a', name, '-m', message]);
}
await this.run(args);
}
<<<<<<<
if (setUpstream) {
args.push('-u');
=======
if (options) {
if (options.setUpstream) {
args.push('-u');
}
if (options.withTags) {
args.push('--tags');
}
>>>>>>>
if (setUpstream) {
args.push('-u');
}
if (tags) {
args.push('--tags'); |
<<<<<<<
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
=======
import { Location } from 'vs/editor/common/modes';
>>>>>>>
import { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { Location } from 'vs/editor/common/modes'; |
<<<<<<<
import { BigNumber } from 'bignumber.js';
import { PaymentOperation, Transaction } from "../../model";
=======
import { Transaction } from "../../model";
>>>>>>>
import { BigNumber } from 'bignumber.js';
import { Transaction } from "../../model"; |
<<<<<<<
onDidChangeFocus: Event<boolean>;
onDidChangeMaximize: Event<boolean>;
=======
onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
>>>>>>>
onDidChangeFocus: Event<boolean> = new Emitter<boolean>().event;
onDidChangeMaximize: Event<boolean> = new Emitter<boolean>().event; |
<<<<<<<
operations(first: Int, last: Int, before: String, after: String, order: Order): OperationConnection
=======
operations(first: Int, last: Int, before: String, after: String): OperationConnection
payments(first: Int, last: Int, before: String, after: String): OperationConnection
>>>>>>>
operations(first: Int, last: Int, before: String, after: String, order: Order): OperationConnection
payments(first: Int, last: Int, before: String, after: String): OperationConnection |
<<<<<<<
import { compare } from "vs/base/common/strings";
import { asWinJsPromise } from 'vs/base/common/async';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
=======
import { compare } from 'vs/base/common/strings';
import { TrieMap } from 'vs/base/common/map';
>>>>>>>
import { compare } from "vs/base/common/strings";
import { asWinJsPromise } from 'vs/base/common/async';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import { TrieMap } from 'vs/base/common/map'; |
<<<<<<<
import { textToMarkedString, MarkedString, markedStringsEquals } from 'vs/base/common/htmlContent';
=======
import { IMarkdownString, MarkdownString, isEmptyMarkdownString } from 'vs/base/common/htmlContent';
import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer';
>>>>>>>
import { IMarkdownString, MarkdownString, isEmptyMarkdownString, markedStringsEquals } from 'vs/base/common/htmlContent';
import { MarkdownRenderer } from 'vs/editor/contrib/markdown/browser/markdownRenderer';
<<<<<<<
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
=======
import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/browser/colorPickerModel';
import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/browser/colorPickerWidget';
import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
import { Color, RGBA } from 'vs/base/common/color';
import { IDisposable, empty as EmptyDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
import { getColorPresentations } from 'vs/editor/contrib/colorPicker/common/color';
const $ = dom.$;
class ColorHover {
constructor(
public readonly range: IRange,
public readonly color: IColor,
public readonly provider: DocumentColorProvider
) { }
}
type HoverPart = Hover | ColorHover;
>>>>>>>
import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/browser/colorPickerModel';
import { ColorPickerWidget } from 'vs/editor/contrib/colorPicker/browser/colorPickerWidget';
import { ColorDetector } from 'vs/editor/contrib/colorPicker/browser/colorDetector';
import { Color, RGBA } from 'vs/base/common/color';
import { IDisposable, empty as EmptyDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
import { getColorPresentations } from 'vs/editor/contrib/colorPicker/common/color';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
const $ = dom.$;
class ColorHover {
constructor(
public readonly range: IRange,
public readonly color: IColor,
public readonly provider: DocumentColorProvider
) { }
}
type HoverPart = Hover | ColorHover;
<<<<<<<
constructor(editor: ICodeEditor, openerService: IOpenerService, modeService: IModeService, private telemetryService: ITelemetryService) {
=======
constructor(editor: ICodeEditor, markdownRenderner: MarkdownRenderer) {
>>>>>>>
constructor(editor: ICodeEditor, markdownRenderner: MarkdownRenderer, private telemetryService: ITelemetryService) {
<<<<<<<
this.telemetryService.publicLog('editor.contentHoverWidgetDisplayed');
this.showAt(new Position(renderRange.startLineNumber, renderColumn), this._shouldFocus);
=======
>>>>>>>
this.telemetryService.publicLog('editor.contentHoverWidgetDisplayed'); |
<<<<<<<
=======
export interface IPathPaymentOperation extends IBaseOperation {
sendMax: string;
amountSent: string;
amountReceived: string;
destinationAccount: AccountID;
destinationAsset: stellar.Asset;
sourceAsset: stellar.Asset;
}
>>>>>>>
export interface IPathPaymentOperation extends IBaseOperation {
sendMax: string;
amountSent: string;
amountReceived: string;
destinationAccount: AccountID;
destinationAsset: stellar.Asset;
sourceAsset: stellar.Asset;
}
<<<<<<<
| IPathPaymentStrictSendOperation
| ICreatePassiveSellOfferOperation;
=======
| IInflationOperation
| IPathPaymentStrictSendOperation;
>>>>>>>
| IPathPaymentStrictSendOperation
| ICreatePassiveSellOfferOperation
| IPathPaymentStrictSendOperation; |
<<<<<<<
=======
import FileResultsNavigation from 'vs/workbench/parts/files/browser/fileResultsNavigation';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
>>>>>>>
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; |
<<<<<<<
describe: 'filter rules to restrict dependencies to check updates',
=======
describe: 'filter rules to restrict a subsets of dependencies for updates',
array: true,
>>>>>>>
describe: 'filter rules to restrict dependencies to check updates',
array: true, |
<<<<<<<
command: `diff source:"${projectPath}tests${sep}diffbase${sep}diff_html_diffSpaceIgnore.txt" diff:"${projectPath}tests${sep}diffnew${sep}diff_html_diffSpaceIgnore.txt" read_method:file`,
qualifier: "contains",
test: `${text.red}<p></p>${text.none}\n${text.green}<p${text.diffchar} id="diff"${text.clear}>${text.diffchar}Add id and text${text.clear}</p>${text.none}`
},
{
=======
command: `diff source:"${projectPath}tests${sep}diffbase${sep}html.txt" diff:"${projectPath}tests${sep}diffnew${sep}html.txt" language:html`,
qualifier: "ends",
test: `${text.green}Pretty Diff found no differences.${text.none}`
},
{
>>>>>>>
command: `diff source:"${projectPath}tests${sep}diffbase${sep}html.txt" diff:"${projectPath}tests${sep}diffnew${sep}html.txt" language:html`,
qualifier: "ends",
test: `${text.green}Pretty Diff found no differences.${text.none}`
},
{
command: `diff source:"${projectPath}tests${sep}diffbase${sep}diff_html_diffSpaceIgnore.txt" diff:"${projectPath}tests${sep}diffnew${sep}diff_html_diffSpaceIgnore.txt" read_method:file`,
qualifier: "contains",
test: `${text.red}<p></p>${text.none}\n${text.green}<p${text.diffchar} id="diff"${text.clear}>${text.diffchar}Add id and text${text.clear}</p>${text.none}`
},
{ |
<<<<<<<
constructor(root: T, showDetachedWarning: boolean = true);
=======
constructor(root: any, showDetachedWarning?: boolean);
>>>>>>>
constructor(root: T, showDetachedWarning?: boolean);
<<<<<<<
public observe(record: Boolean, callback: Function): T;
=======
public observe(record: Boolean, callback?: Function): any;
>>>>>>>
public observe(record: Boolean, callback?: Function): T; |
<<<<<<<
await assertEx.throwsOrRejectsAsync(async () => testConfigureDocker('ASP.NET Core', {}, ['Windows', 'No', '1234']),
=======
await assertEx.throwsOrRejectsAsync(async () => testConfigureDocker('.NET: ASP.NET Core', {}, ['Windows', '1234']),
>>>>>>>
await assertEx.throwsOrRejectsAsync(async () => testConfigureDocker('.NET: ASP.NET Core', {}, ['Windows', 'No', '1234']),
<<<<<<<
['.NET Core Console', 'No'],
=======
['.NET: Core Console'],
>>>>>>>
['.NET: Core Console', 'No'],
<<<<<<<
['.NET Core Console', 'No'],
=======
['.NET: Core Console'],
>>>>>>>
['.NET: Core Console', 'No'],
<<<<<<<
['ASP.NET Core', 'No'], ['serviceFolder/subfolder1/Dockerfile', 'serviceFolder/subfolder1/.dockerignore', 'serviceFolder/subfolder1/somefile1.cs', 'serviceFolder/subfolder1/aspnetapp.csproj']
=======
['.NET: ASP.NET Core'], ['serviceFolder/subfolder1/Dockerfile', 'serviceFolder/subfolder1/.dockerignore', 'serviceFolder/subfolder1/somefile1.cs', 'serviceFolder/subfolder1/aspnetapp.csproj']
>>>>>>>
['.NET: ASP.NET Core', 'No'], ['serviceFolder/subfolder1/Dockerfile', 'serviceFolder/subfolder1/.dockerignore', 'serviceFolder/subfolder1/somefile1.cs', 'serviceFolder/subfolder1/aspnetapp.csproj'] |
<<<<<<<
import { DocumentSelector, LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, Proposed, ProposedFeatures, DidChangeConfigurationNotification } from 'vscode-languageclient';
=======
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, ConfigurationParams, DidChangeConfigurationNotification } from 'vscode-languageclient';
>>>>>>>
import { DocumentSelector, LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Middleware, ConfigurationParams, DidChangeConfigurationNotification } from 'vscode-languageclient'; |
<<<<<<<
import { suite as SelectTests } from './tests/select.test';
import { suite as ShouldAddTest } from './tests/shouldAdd.test';
import { suite as StringValidatorTests } from './tests/stringValidator.test';
=======
import { typeguards as TypeguardsTest } from './tests/typeguards.test';
>>>>>>>
import { suite as SelectTests } from './tests/select.test';
import { suite as ShouldAddTest } from './tests/shouldAdd.test';
import { suite as StringValidatorTests } from './tests/stringValidator.test';
import { suite as TypeguardsTest } from './tests/typeguards.test';
<<<<<<<
describe('BigUser', BigUserTest.bind(this));
=======
describe('Hooks', HookTest.bind(this));
describe('Type guards', TypeguardsTest.bind(this));
it('should create a User with connections', async () => {
const car = await Car.create({
model: 'Tesla',
version: 'ModelS',
price: mongoose.Types.Decimal128.fromString('50123.25')
});
const [trabant, zastava] = await Car.create([{
model: 'Trabant',
price: mongoose.Types.Decimal128.fromString('28189.25')
}, {
model: 'Zastava',
price: mongoose.Types.Decimal128.fromString('1234.25')
}]);
const user = await User.create({
_id: mongoose.Types.ObjectId(),
firstName: 'John',
lastName: 'Doe',
age: 20,
uniqueId: 'john-doe-20',
gender: Genders.MALE,
role: Role.User,
job: {
title: 'Developer',
position: 'Lead',
jobType: {
salery: 5000,
field: 'IT',
},
},
car: car.id,
languages: ['english', 'typescript'],
previousJobs: [{
title: 'Janitor',
}, {
title: 'Manager',
}],
previousCars: [trabant.id, zastava.id],
});
{
const foundUser = await User
.findById(user.id)
.populate('car previousCars')
.exec();
expect(foundUser).to.have.property('nick', 'Nothing');
expect(foundUser).to.have.property('firstName', 'John');
expect(foundUser).to.have.property('lastName', 'Doe');
expect(foundUser).to.have.property('uniqueId', 'john-doe-20');
expect(foundUser).to.have.property('age', 20);
expect(foundUser).to.have.property('gender', Genders.MALE);
expect(foundUser).to.have.property('role', Role.User);
expect(foundUser).to.have.property('roles').to.have.length(1).to.include(Role.Guest);
expect(foundUser).to.have.property('job');
expect(foundUser).to.have.property('car');
expect(foundUser).to.have.property('languages').to.have.length(2).to.include('english').to.include('typescript');
expect(foundUser.job).to.have.property('title', 'Developer');
expect(foundUser.job).to.have.property('position', 'Lead');
expect(foundUser.job).to.have.property('startedAt').to.be.instanceof(Date);
expect(foundUser.job.jobType).to.not.have.property('_id');
expect(foundUser.job.titleInUppercase()).to.eq('Developer'.toUpperCase());
expect(foundUser.job.jobType).to.have.property('salery', 5000);
expect(foundUser.job.jobType).to.have.property('field', 'IT');
expect(foundUser.job.jobType).to.have.property('salery').to.be.a('number');
expect(foundUser.car).to.have.property('model', 'Tesla');
expect(foundUser.car).to.have.property('version', 'models');
expect(foundUser).to.have.property('previousJobs').to.have.length(2);
expect(foundUser).to.have.property('fullName', 'John Doe');
>>>>>>>
describe('BigUser', BigUserTest.bind(this)); |
<<<<<<<
=======
export type Func = (...args: any[]) => any;
export type RequiredType = boolean | [boolean, string] | string | Func | [Func, string];
export type RefType = number | string | mongoose.Types.ObjectId | Buffer;
export type RefSchemaType = typeof mongoose.Schema.Types.Number |
typeof mongoose.Schema.Types.String |
typeof mongoose.Schema.Types.Buffer |
typeof mongoose.Schema.Types.ObjectId;
export type ValidatorFunction = (value: any) => boolean | Promise<boolean>;
export type Validator =
| ValidatorFunction
| RegExp
| {
validator: ValidatorFunction;
message?: string;
};
export interface BasePropOptions {
/** include this value?
* @default true (Implicitly)
*/
select?: boolean;
/** is this value required?
* @default false (Implicitly)
*/
required?: RequiredType;
/** Only accept Values from the Enum(|Array) */
enum?: string[] | object;
/** Give the Property a default Value */
default?: any;
/** Give an Validator RegExp or Function */
validate?: Validator | Validator[];
/** should this value be unique?
* @link https://docs.mongodb.com/manual/indexes/#unique-indexes
*/
unique?: boolean;
/** should this value get an index?
* @link https://docs.mongodb.com/manual/indexes
*/
index?: boolean;
/** @link https://docs.mongodb.com/manual/indexes/#sparse-indexes */
sparse?: boolean;
/** when should this property expire?
* @link https://docs.mongodb.com/manual/tutorial/expire-data
*/
expires?: string | number;
/** should subdocuments get their own id?
* @default true (Implicitly)
*/
_id?: boolean;
}
export interface PropOptions extends BasePropOptions {
/** Reference an other Document (you should use Ref<T> as Prop type) */
ref?: any;
/** Take the Path and try to resolve it to a Model */
refPath?: string;
/** Type of id field of referenced documents (default: ObjectId) */
refType?: RefSchemaType;
/**
* Give the Property an alias in the output
* Note: you should include the alias as a variable in the class, but not with a prop decorator
* @example
* ```ts
* class Dummy extends Typegoose {
* @prop({ alias: "helloWorld" })
* public hello: string; // normal, with @prop
* public helloWorld: string; // is just for type Completion, will not be included in the DB
* }
* ```
*/
alias?: string;
}
export interface ValidateNumberOptions {
/** The Number must be at least this high */
min?: number | [number, string];
/** The Number can only be lower than this */
max?: number | [number, string];
}
export interface ValidateStringOptions {
/** Only Allowes if the value matches an RegExp */
match?: RegExp | [RegExp, string];
/** Only Allowes if the value is in the Enum */
enum?: string[];
/** Only Allowes if the value is at least the lenght */
minlength?: number | [number, string];
/** Only Allowes if the value is not longer than the maxlenght */
maxlength?: number | [number, string];
}
export interface TransformStringOptions {
/** Should it be lowercased before save? */
lowercase?: boolean;
/** Should it be uppercased before save? */
uppercase?: boolean;
/** Should it be trimmed before save? */
trim?: boolean;
}
export interface VirtualOptions {
ref: string;
localField: string;
foreignField: string;
justOne: boolean;
/** Set to true, when it is an "virtual populate-able" */
overwrite: boolean;
}
export type PropOptionsWithNumberValidate = PropOptions & ValidateNumberOptions;
export type PropOptionsWithStringValidate = PropOptions & TransformStringOptions & ValidateStringOptions;
export type PropOptionsWithValidate = PropOptionsWithNumberValidate | PropOptionsWithStringValidate | VirtualOptions;
>>>>>>>
<<<<<<<
delete rawOptions.ref;
schemas.get(name)[key] = {
...schemas.get(name)[key],
type: mongoose.Schema.Types.ObjectId,
=======
schema[name][key] = {
...schema[name][key],
type: refType,
>>>>>>>
delete rawOptions.ref;
schemas.get(name)[key] = {
...schemas.get(name)[key],
type: refType,
<<<<<<<
delete rawOptions.ref;
schemas.get(name)[key] = {
...schemas.get(name)[key],
type: mongoose.Schema.Types.ObjectId,
=======
schema[name][key] = {
...schema[name][key],
type: refType,
>>>>>>>
delete rawOptions.ref;
schemas.get(name)[key] = {
...schemas.get(name)[key],
type: refType,
<<<<<<<
delete rawOptions.itemsRef;
schemas.get(name)[key][0] = {
...schemas.get(name)[key][0],
type: mongoose.Schema.Types.ObjectId,
=======
schema[name][key][0] = {
...schema[name][key][0],
type: itemsRefType,
>>>>>>>
delete rawOptions.itemsRef;
schemas.get(name)[key][0] = {
...schemas.get(name)[key][0],
type: itemsRefType,
<<<<<<<
delete rawOptions.itemsRef;
schemas.get(name)[key][0] = {
...schemas.get(name)[key][0],
type: mongoose.Schema.Types.ObjectId,
=======
schema[name][key][0] = {
...schema[name][key][0],
type: itemsRefType,
>>>>>>>
delete rawOptions.itemsRef;
schemas.get(name)[key][0] = {
...schemas.get(name)[key][0],
type: itemsRefType,
<<<<<<<
delete rawOptions.refPath;
schemas.get(name)[key] = {
...schemas.get(name)[key],
type: mongoose.Schema.Types.ObjectId,
=======
schema[name][key] = {
...schema[name][key],
type: refType,
>>>>>>>
delete rawOptions.refPath;
schemas.get(name)[key] = {
...schemas.get(name)[key],
type: itemsRefType,
<<<<<<<
delete rawOptions.itemsRefPath;
schemas.get(name)[key][0] = {
...schemas.get(name)[key][0],
type: mongoose.Schema.Types.ObjectId,
=======
schema[name][key][0] = {
...schema[name][key][0],
type: itemsRefType,
>>>>>>>
delete rawOptions.itemsRefPath;
schemas.get(name)[key][0] = {
...schemas.get(name)[key][0],
type: itemsRefType,
<<<<<<<
}
=======
}
/**
* Reference another Model
*/
export type Ref<R, T extends RefType = mongoose.Types.ObjectId> = R | T;
>>>>>>>
} |
<<<<<<<
return this.restApiService
.getRepos(filter, reposPerPage, offset)
.then(repos => {
// Late response.
if (filter !== this._filter || !repos) {
return;
}
this._repos = repos;
this._loading = false;
});
=======
return this.$.restAPI.getRepos(filter, reposPerPage, offset).then(repos => {
// Late response.
if (filter !== this._filter || !repos) {
return;
}
this._repos = repos.filter(repo => repo.name.includes(filter));
this._loading = false;
});
>>>>>>>
return this.restApiService
.getRepos(filter, reposPerPage, offset)
.then(repos => {
// Late response.
if (filter !== this._filter || !repos) {
return;
}
this._repos = repos.filter(repo => repo.name.includes(filter));
this._loading = false;
}); |
<<<<<<<
public add(key: string, volume: number = 1, loop: bool = false): Kiwi.Sound.Audio {
/*
=======
public add(cacheID: string, cache: Kiwi.Files.Cache, volume: number = 1, loop: bool = false): Kiwi.Sound.Audio {
>>>>>>>
public add(key: string, volume: number = 1, loop: bool = false): Kiwi.Sound.Audio { |
<<<<<<<
this.members.push(child);
child.layer = this.currentLayer;
=======
super.removeChild(child);
//this.members.push(child);
var layer = null;
super.addChild(child);
>>>>>>>
super.removeChild(child);
//this.members.push(child);
child.layer = this.currentLayer;
super.addChild(child); |
<<<<<<<
* Adds an Entity to this Group. The Entity must not already be in this Group and it must be supported by the Group.
* @method addChild
* @param {Kiwi.Entity} The child to be added.
* @return {Kiwi.Entity} The child.
**/
public addChild(child: Kiwi.Entity): Kiwi.Entity {
=======
* Adds an Entity to this Group. The Entity must not already be in this Group and it must be supported by the Group.
* @method addChild
* @param {Kiwi.Entity} The child to be added.
* @return {Kiwi.Entity} The child.
**/
public addChild(child: Kiwi.IChild): Kiwi.IChild {
if (child.childType() === Kiwi.ENTITY) {
if ((<Kiwi.Entity>child).supportsType(this.type) === false)
{
klog.warn('Warning - Entity has been added to a Group that exists on a Layer it cannot render to');
return null;
}
}
>>>>>>>
* Adds an Entity to this Group. The Entity must not already be in this Group and it must be supported by the Group.
* @method addChild
* @param {Kiwi.Entity} The child to be added.
* @return {Kiwi.Entity} The child.
**/
public addChild(child: Kiwi.IChild): Kiwi.IChild {
<<<<<<<
=======
if (child.childType() === Kiwi.ENTITY) {
if ((<Kiwi.Entity>child).supportsType(this.type) === false)
{
klog.warn('Invalid Entity Type added to Group: ' + child.id);
return null;
}
}
>>>>>>>
<<<<<<<
=======
if (child.childType() === Kiwi.ENTITY) {
if ((<Kiwi.Entity>child).supportsType(this.type) === false) {
klog.warn('Invalid Entity Type added to Group: ' + child.id);
return null;
}
}
>>>>>>>
<<<<<<<
* @return {Kiwi.Entity} The child.
*/
public addChildAfter(child: Kiwi.Entity, beforeChild: Kiwi.Entity): Kiwi.Entity {
=======
* @return {Kiwi.Entity} The child.
*/
public addChildAfter(child: Kiwi.IChild, beforeChild: Kiwi.IChild): Kiwi.IChild {
if (child.childType() === Kiwi.ENTITY) {
if ((<Kiwi.Entity>child).supportsType(this.type) === false) {
klog.warn('Invalid Entity Type added to Group: ' + child.id);
return null;
}
}
>>>>>>>
* @return {Kiwi.Entity} The child.
*/
public addChildAfter(child: Kiwi.IChild, beforeChild: Kiwi.IChild): Kiwi.IChild {
<<<<<<<
=======
if (newChild.childType() === Kiwi.ENTITY) {
if ((<Kiwi.Entity>newChild).supportsType(this.type) === false)
{
klog.warn('Invalid Entity Type added to Group: ' + newChild.id);
return null;
}
}
>>>>>>>
<<<<<<<
=======
this.type = this.layer.type;
console.log(this.type);
>>>>>>>
console.log(this.type); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.