From eccc41c5cfab2d615f1b2874287205251d9406eb Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Wed, 8 May 2019 10:30:54 -0700 Subject: [PATCH] =?UTF-8?q?refactor:=20using=20=E1=90=B1=20instead=20of=20?= =?UTF-8?q?=CE=94=20in=20tests=20(#30338)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is in preparation to move instructions back to using `Δ` prefix PR Close #30338 --- packages/language-service/test/definitions_spec.ts | 10 +++++----- packages/language-service/test/hover_spec.ts | 10 +++++----- packages/language-service/test/test_data.ts | 4 ++-- packages/language-service/test/test_utils.ts | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/language-service/test/definitions_spec.ts b/packages/language-service/test/definitions_spec.ts index 03395b40b4..b7d78e1404 100644 --- a/packages/language-service/test/definitions_spec.ts +++ b/packages/language-service/test/definitions_spec.ts @@ -26,22 +26,22 @@ describe('definitions', () => { it('should be able to find field in an interpolation', () => { localReference( - ` @Component({template: '{{«name»}}'}) export class MyComponent { «ΔnameΔ: string;» }`); + ` @Component({template: '{{«name»}}'}) export class MyComponent { «ᐱnameᐱ: string;» }`); }); it('should be able to find a field in a attribute reference', () => { localReference( - ` @Component({template: ''}) export class MyComponent { «ΔnameΔ: string;» }`); + ` @Component({template: ''}) export class MyComponent { «ᐱnameᐱ: string;» }`); }); it('should be able to find a method from a call', () => { localReference( - ` @Component({template: '
'}) export class MyComponent { «ΔmyClickΔ() { }»}`); + ` @Component({template: '
'}) export class MyComponent { «ᐱmyClickᐱ() { }»}`); }); it('should be able to find a field reference in an *ngIf', () => { localReference( - ` @Component({template: '
'}) export class MyComponent { «ΔincludeΔ = true;»}`); + ` @Component({template: '
'}) export class MyComponent { «ᐱincludeᐱ = true;»}`); }); it('should be able to find a reference to a component', () => { @@ -165,4 +165,4 @@ function stringifySpan(span: Span) { function stringifySpans(spans: Span[]) { return spans ? `[${spans.map(stringifySpan).join(', ')}]` : ''; -} \ No newline at end of file +} diff --git a/packages/language-service/test/hover_spec.ts b/packages/language-service/test/hover_spec.ts index 41bf242dd1..c8a1140b09 100644 --- a/packages/language-service/test/hover_spec.ts +++ b/packages/language-service/test/hover_spec.ts @@ -40,7 +40,7 @@ describe('hover', () => { it('should be able to find a method from a call', () => { hover( - ` @Component({template: '
'}) export class MyComponent { myClick() { }}`, + ` @Component({template: '
'}) export class MyComponent { myClick() { }}`, 'method myClick of MyComponent'); }); @@ -52,19 +52,19 @@ describe('hover', () => { it('should be able to find a reference to a component', () => { hover( - ` @Component({template: '«<ΔtestΔ-comp>»'}) export class MyComponent { }`, + ` @Component({template: '«<ᐱtestᐱ-comp>»'}) export class MyComponent { }`, 'component TestComponent'); }); it('should be able to find an event provider', () => { hover( - ` @Component({template: ''}) export class MyComponent { myHandler() {} }`, + ` @Component({template: ''}) export class MyComponent { myHandler() {} }`, 'event testEvent of TestComponent'); }); it('should be able to find an input provider', () => { hover( - ` @Component({template: ''}) export class MyComponent { name = 'my name'; }`, + ` @Component({template: ''}) export class MyComponent { name = 'my name'; }`, 'property name of TestComponent'); }); @@ -111,4 +111,4 @@ describe('hover', () => { } function toText(hover: Hover): string { return hover.text.map(h => h.text).join(''); } -}); \ No newline at end of file +}); diff --git a/packages/language-service/test/test_data.ts b/packages/language-service/test/test_data.ts index 10b4c7843e..34931629aa 100644 --- a/packages/language-service/test/test_data.ts +++ b/packages/language-service/test/test_data.ts @@ -143,8 +143,8 @@ export class References {} @Component({selector: 'test-comp', template: '
Testing: {{name}}
'}) export class TestComponent { - «@Input('ΔtcNameΔ') name = 'test';» - «@Output('ΔtestΔ') testEvent = new EventEmitter();» + «@Input('ᐱtcNameᐱ') name = 'test';» + «@Output('ᐱtestᐱ') testEvent = new EventEmitter();» } @Component({templateUrl: 'test.ng'}) diff --git a/packages/language-service/test/test_utils.ts b/packages/language-service/test/test_utils.ts index 38bf0c1754..350a039084 100644 --- a/packages/language-service/test/test_utils.ts +++ b/packages/language-service/test/test_utils.ts @@ -278,7 +278,7 @@ function getLocationMarkers(value: string): {[name: string]: number} { return result; } -const referenceMarker = /«(((\w|\-)+)|([^Δ]*Δ(\w+)Δ.[^»]*))»/g; +const referenceMarker = /«(((\w|\-)+)|([^ᐱ]*ᐱ(\w+)ᐱ.[^»]*))»/g; const definitionMarkerGroup = 1; const nameMarkerGroup = 2; @@ -300,7 +300,7 @@ function getReferenceMarkers(value: string): ReferenceResult { const text = value.replace( referenceMarker, (match: string, text: string, reference: string, _: string, definition: string, definitionName: string, index: number): string => { - const result = reference ? text : text.replace(/Δ/g, ''); + const result = reference ? text : text.replace(/ᐱ/g, ''); const span: Span = {start: index - adjustment, end: index - adjustment + result.length}; const markers = reference ? references : definitions; const name = reference || definitionName; @@ -313,7 +313,7 @@ function getReferenceMarkers(value: string): ReferenceResult { } function removeReferenceMarkers(value: string): string { - return value.replace(referenceMarker, (match, text) => text.replace(/Δ/g, '')); + return value.replace(referenceMarker, (match, text) => text.replace(/ᐱ/g, '')); } export function noDiagnostics(diagnostics: Diagnostics) {