ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-28 07:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/platform/instantiation/test/common/instantiationService.test.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import assert = require('assert');
import * as assert from 'assert';
import { createDecorator, optional, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
@@ -56,7 +56,7 @@ interface IDependentService {
class DependentService implements IDependentService {
_serviceBrand: any;
constructor( @IService1 service: IService1) {
constructor(@IService1 service: IService1) {
assert.equal(service.c, 1);
}
@@ -65,7 +65,7 @@ class DependentService implements IDependentService {
class Service1Consumer {
constructor( @IService1 service1: IService1) {
constructor(@IService1 service1: IService1) {
assert.ok(service1);
assert.equal(service1.c, 1);
}
@@ -73,7 +73,7 @@ class Service1Consumer {
class Target2Dep {
constructor( @IService1 service1: IService1, @IService2 service2) {
constructor(@IService1 service1: IService1, @IService2 service2) {
assert.ok(service1 instanceof Service1);
assert.ok(service2 instanceof Service2);
}
@@ -88,12 +88,12 @@ class TargetWithStaticParam {
}
class TargetNotOptional {
constructor( @IService1 service1: IService1, @IService2 service2: IService2) {
constructor(@IService1 service1: IService1, @IService2 service2: IService2) {
}
}
class TargetOptional {
constructor( @IService1 service1: IService1, @optional(IService2) service2: IService2) {
constructor(@IService1 service1: IService1, @optional(IService2) service2: IService2) {
assert.ok(service1);
assert.equal(service1.c, 1);
assert.ok(service2 === void 0);
@@ -101,14 +101,14 @@ class TargetOptional {
}
class DependentServiceTarget {
constructor( @IDependentService d) {
constructor(@IDependentService d) {
assert.ok(d);
assert.equal(d.name, 'farboo');
}
}
class DependentServiceTarget2 {
constructor( @IDependentService d: IDependentService, @IService1 s: IService1) {
constructor(@IDependentService d: IDependentService, @IService1 s: IService1) {
assert.ok(d);
assert.equal(d.name, 'farboo');
assert.ok(s);
@@ -121,7 +121,7 @@ class ServiceLoop1 implements IService1 {
_serviceBrand: any;
c = 1;
constructor( @IService2 s: IService2) {
constructor(@IService2 s: IService2) {
}
}
@@ -130,7 +130,7 @@ class ServiceLoop2 implements IService2 {
_serviceBrand: any;
d = true;
constructor( @IService1 s: IService1) {
constructor(@IService1 s: IService1) {
}
}