Skip to content

Commit 18b7257

Browse files
CyrusNajmabadiCyrusNajmabadi
committed
Merge pull request #2187 from Microsoft/CRLF
Use CRLF in our code, not LF.
2 parents 3b1a390 + c8399fc commit 18b7257

File tree

353 files changed

+8230
-8230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+8230
-8230
lines changed

‎src/harness/harnessLanguageService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path='..\services\services.ts' />
1+
/// <reference path='..\services\services.ts' />
22
/// <reference path='..\services\shims.ts' />
33
/// <reference path='..\server\client.ts' />
44
/// <reference path='harness.ts' />

‎src/services/signatureHelp.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ module ts.SignatureHelp {
295295
var tagExpression = <TaggedTemplateExpression>templateExpression.parent;
296296
Debug.assert(templateExpression.kind === SyntaxKind.TemplateExpression);
297297

298-
// If we're just after a template tail, don't show signature help.
299-
if (node.kind === SyntaxKind.TemplateTail && !isInsideTemplateLiteral(<LiteralExpression>node, position)) {
298+
// If we're just after a template tail, don't show signature help.
299+
if (node.kind === SyntaxKind.TemplateTail && !isInsideTemplateLiteral(<LiteralExpression>node, position)) {
300300
return undefined;
301301
}
302302

‎tests/cases/fourslash/addDeclareToModule.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
//// /**/module mAmbient {
4-
//// module m3 { }
5-
//// }
6-
7-
goTo.marker('');
8-
edit.insert("declare ");
1+
/// <reference path="fourslash.ts" />
2+
3+
//// /**/module mAmbient {
4+
//// module m3 { }
5+
//// }
6+
7+
goTo.marker('');
8+
edit.insert("declare ");

‎tests/cases/fourslash/addDuplicateSetter.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
//// class C {
4-
//// set foo(value) { }
5-
//// /**/
6-
//// }
7-
8-
goTo.marker();
9-
edit.insert("set foo(value) { }");
10-
1+
/// <reference path="fourslash.ts" />
2+
3+
//// class C {
4+
//// set foo(value) { }
5+
//// /**/
6+
//// }
7+
8+
goTo.marker();
9+
edit.insert("set foo(value) { }");
10+

‎tests/cases/fourslash/addFunctionInDuplicatedConstructorClassBody.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
//// class Foo {
4-
//// constructor() { }
5-
//// constructor() { }
6-
//// /**/
7-
//// }
8-
9-
goTo.marker();
10-
var func = 'fn() { }';
11-
edit.insert(func);
12-
verify.numberOfErrorsInCurrentFile(2);
1+
/// <reference path="fourslash.ts" />
2+
3+
//// class Foo {
4+
//// constructor() { }
5+
//// constructor() { }
6+
//// /**/
7+
//// }
8+
9+
goTo.marker();
10+
var func = 'fn() { }';
11+
edit.insert(func);
12+
verify.numberOfErrorsInCurrentFile(2);

‎tests/cases/fourslash/addInterfaceMemberAboveClass.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
////
4-
//// interface Intersection {
5-
//// /*insertHere*/
6-
//// }
7-
//// interface Scene { }
8-
//// class /*className*/Sphere {
9-
//// constructor() {
10-
//// }
11-
//// }
12-
13-
goTo.marker('className');
14-
verify.quickInfoIs('class Sphere');
15-
16-
goTo.marker('insertHere');
17-
edit.insert("ray: Ray;");
18-
19-
goTo.marker('className');
20-
1+
/// <reference path="fourslash.ts" />
2+
3+
////
4+
//// interface Intersection {
5+
//// /*insertHere*/
6+
//// }
7+
//// interface Scene { }
8+
//// class /*className*/Sphere {
9+
//// constructor() {
10+
//// }
11+
//// }
12+
13+
goTo.marker('className');
14+
verify.quickInfoIs('class Sphere');
15+
16+
goTo.marker('insertHere');
17+
edit.insert("ray: Ray;");
18+
19+
goTo.marker('className');
20+
2121
verify.quickInfoIs('class Sphere');

‎tests/cases/fourslash/addInterfaceToNotSatisfyConstraint.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
//// interface A {
4-
//// a: number;
5-
//// }
6-
//// /**/
7-
//// interface C<T extends A> {
8-
//// x: T;
9-
//// }
10-
////
11-
//// var v2: C<B>; // should not work
12-
13-
goTo.marker();
14-
edit.insert("interface B { b: string; }");
1+
/// <reference path="fourslash.ts" />
2+
3+
//// interface A {
4+
//// a: number;
5+
//// }
6+
//// /**/
7+
//// interface C<T extends A> {
8+
//// x: T;
9+
//// }
10+
////
11+
//// var v2: C<B>; // should not work
12+
13+
goTo.marker();
14+
edit.insert("interface B { b: string; }");

‎tests/cases/fourslash/addMemberToInterface.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
////
4-
//// module /*check*/Mod{
5-
//// }
6-
////
7-
//// interface MyInterface {
8-
//// /*insert*/
9-
//// }
10-
11-
edit.disableFormatting();
12-
13-
goTo.marker('check');
14-
verify.quickInfoIs('module Mod');
15-
16-
goTo.marker('insert');
17-
edit.insert("x: number;\n");
18-
19-
goTo.marker('check');
20-
verify.quickInfoIs('module Mod');
1+
/// <reference path="fourslash.ts" />
2+
3+
////
4+
//// module /*check*/Mod{
5+
//// }
6+
////
7+
//// interface MyInterface {
8+
//// /*insert*/
9+
//// }
10+
11+
edit.disableFormatting();
12+
13+
goTo.marker('check');
14+
verify.quickInfoIs('module Mod');
15+
16+
goTo.marker('insert');
17+
edit.insert("x: number;\n");
18+
19+
goTo.marker('check');
20+
verify.quickInfoIs('module Mod');

‎tests/cases/fourslash/addMethodToInterface1.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
//// interface Comparable<T> {
4-
//// /*1*/}
5-
//// interface Comparer {
6-
//// }
7-
//// var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y };
8-
//// var maxResult = max2(1);
9-
10-
edit.disableFormatting();
11-
12-
goTo.marker('1');
13-
14-
edit.insert(" compareTo(): number;\n");
1+
/// <reference path="fourslash.ts" />
2+
3+
//// interface Comparable<T> {
4+
//// /*1*/}
5+
//// interface Comparer {
6+
//// }
7+
//// var max2: Comparer = (x, y) => { return (x.compareTo(y) > 0) ? x : y };
8+
//// var maxResult = max2(1);
9+
10+
edit.disableFormatting();
11+
12+
goTo.marker('1');
13+
14+
edit.insert(" compareTo(): number;\n");

‎tests/cases/fourslash/addVarToConstructor1.ts

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
////
4-
//// //_modes. // produces an internal error - please implement in derived class
5-
////
6-
//// module editor {
7-
//// import modes = _modes;
8-
////
9-
//// var i : modes.IMode;
10-
////
11-
//// // If you just use p1:modes, the compiler accepts it - should be an error
12-
//// class Bg {
13-
//// constructor(p1: modes, p2: modes.Mode) {// should be an error on p2 - it's not exported
14-
//// /*1*/}
15-
////
16-
//// }
17-
//// }
18-
////
19-
20-
edit.disableFormatting();
21-
22-
goTo.marker('1');
23-
24-
edit.insert(" var x:modes.Mode;\n");
1+
/// <reference path="fourslash.ts" />
2+
3+
////
4+
//// //_modes. // produces an internal error - please implement in derived class
5+
////
6+
//// module editor {
7+
//// import modes = _modes;
8+
////
9+
//// var i : modes.IMode;
10+
////
11+
//// // If you just use p1:modes, the compiler accepts it - should be an error
12+
//// class Bg {
13+
//// constructor(p1: modes, p2: modes.Mode) {// should be an error on p2 - it's not exported
14+
//// /*1*/}
15+
////
16+
//// }
17+
//// }
18+
////
19+
20+
edit.disableFormatting();
21+
22+
goTo.marker('1');
23+
24+
edit.insert(" var x:modes.Mode;\n");

‎tests/cases/fourslash/alignmentAfterFormattingOnMultilineExpressionAndParametersList.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/// <reference path='fourslash.ts' />
2-
3-
////class TestClass {
4-
//// private testMethod1(param1: boolean,
5-
//// param2/*1*/: boolean) {
6-
//// }
7-
////
8-
//// public testMethod2(a: number, b: number, c: number) {
9-
//// if (a === b) {
10-
//// }
11-
//// else if (a != c &&
12-
//// a/*2*/ > b &&
13-
//// b/*3*/ < c) {
14-
//// }
15-
////
16-
//// }
17-
////}
18-
19-
format.document();
20-
goTo.marker("1");
21-
verify.indentationIs(8);
22-
goTo.marker("2");
23-
verify.indentationIs(12);
24-
goTo.marker("3");
25-
verify.indentationIs(12);
1+
/// <reference path='fourslash.ts' />
2+
3+
////class TestClass {
4+
//// private testMethod1(param1: boolean,
5+
//// param2/*1*/: boolean) {
6+
//// }
7+
////
8+
//// public testMethod2(a: number, b: number, c: number) {
9+
//// if (a === b) {
10+
//// }
11+
//// else if (a != c &&
12+
//// a/*2*/ > b &&
13+
//// b/*3*/ < c) {
14+
//// }
15+
////
16+
//// }
17+
////}
18+
19+
format.document();
20+
goTo.marker("1");
21+
verify.indentationIs(8);
22+
goTo.marker("2");
23+
verify.indentationIs(12);
24+
goTo.marker("3");
25+
verify.indentationIs(12);

‎tests/cases/fourslash/argumentsAreAvailableAfterEditsAtEndOfFunction.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
/// <reference path='fourslash.ts'/>
2-
3-
////module Test1 {
4-
//// class Person {
5-
//// children: string[];
6-
//// constructor(public name: string, children: string[]) {
7-
//// /**/
8-
//// }
9-
//// }
10-
////}
11-
12-
goTo.marker();
13-
var text = "this.children = ch";
14-
edit.insert(text);
1+
/// <reference path='fourslash.ts'/>
2+
3+
////module Test1 {
4+
//// class Person {
5+
//// children: string[];
6+
//// constructor(public name: string, children: string[]) {
7+
//// /**/
8+
//// }
9+
//// }
10+
////}
11+
12+
goTo.marker();
13+
var text = "this.children = ch";
14+
edit.insert(text);
1515
verify.completionListContains("children", "(parameter) children: string[]");

‎tests/cases/fourslash/argumentsIndexExpression.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/// <reference path="fourslash.ts" />
2-
3-
//// function f() {
4-
//// var x = /**/arguments[0];
5-
//// }
6-
7-
goTo.marker();
8-
verify.quickInfoExists();
1+
/// <reference path="fourslash.ts" />
2+
3+
//// function f() {
4+
//// var x = /**/arguments[0];
5+
//// }
6+
7+
goTo.marker();
8+
verify.quickInfoExists();

0 commit comments

Comments
 (0)