From b1c76a9223feb18b0e4baa0da2401239062f46fb Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Tue, 2 Oct 2018 14:49:10 +0200 Subject: [PATCH 1/3] chore: make error message about statics more descriptive Add a 'non-const' qualifier to indicate that you probably forgot to add 'const' on your 'public static' properties. --- packages/jsii/lib/validator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsii/lib/validator.ts b/packages/jsii/lib/validator.ts index 0d66bb12d9..7a5976f5ca 100644 --- a/packages/jsii/lib/validator.ts +++ b/packages/jsii/lib/validator.ts @@ -75,7 +75,7 @@ function _defaultValidations(): ValidationFunction[] { if (member.static && (member as spec.Property).const) { continue; } if (member.name && member.name !== Case.camel(member.name)) { diagnostic(ts.DiagnosticCategory.Error, - `Method and property names must use camelCase: ${member.name}`); + `Method and non-const property names must use camelCase: ${member.name}`); } } } From 49c667900d63b7162578c57cd2c1383d6cb932ee Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Tue, 2 Oct 2018 14:52:25 +0200 Subject: [PATCH 2/3] Update error message to be a bit more correct and typescripty --- packages/jsii/lib/validator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsii/lib/validator.ts b/packages/jsii/lib/validator.ts index 7a5976f5ca..55d1a68064 100644 --- a/packages/jsii/lib/validator.ts +++ b/packages/jsii/lib/validator.ts @@ -75,7 +75,7 @@ function _defaultValidations(): ValidationFunction[] { if (member.static && (member as spec.Property).const) { continue; } if (member.name && member.name !== Case.camel(member.name)) { diagnostic(ts.DiagnosticCategory.Error, - `Method and non-const property names must use camelCase: ${member.name}`); + `Method and non-static non-readonly property names must use camelCase: ${member.name}`); } } } From 7e7362e09fe5e524729c1284daf8c5cb22aba5d1 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Tue, 9 Oct 2018 13:26:22 +0200 Subject: [PATCH 3/3] Update expected errors --- packages/jsii/test/negatives/neg.method-name.1.ts | 2 +- packages/jsii/test/negatives/neg.method-name.2.ts | 2 +- packages/jsii/test/negatives/neg.property-name.1.ts | 2 +- packages/jsii/test/negatives/neg.property-name.2.ts | 2 +- packages/jsii/test/negatives/neg.static-method-name.1.ts | 2 +- packages/jsii/test/negatives/neg.static-method-name.ts | 2 +- packages/jsii/test/negatives/neg.static-prop-name.1.ts | 2 +- packages/jsii/test/negatives/neg.static-prop-name.2.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/jsii/test/negatives/neg.method-name.1.ts b/packages/jsii/test/negatives/neg.method-name.1.ts index 879da41f56..904d6afed6 100644 --- a/packages/jsii/test/negatives/neg.method-name.1.ts +++ b/packages/jsii/test/negatives/neg.method-name.1.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: METHOD +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: METHOD export class MyClass { public METHOD() { diff --git a/packages/jsii/test/negatives/neg.method-name.2.ts b/packages/jsii/test/negatives/neg.method-name.2.ts index c4baa80f75..1afff6517d 100644 --- a/packages/jsii/test/negatives/neg.method-name.2.ts +++ b/packages/jsii/test/negatives/neg.method-name.2.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: hello_world +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: hello_world export class MyClass { public hello_world() { diff --git a/packages/jsii/test/negatives/neg.property-name.1.ts b/packages/jsii/test/negatives/neg.property-name.1.ts index 1d1e1c9b7c..97bb30e64a 100644 --- a/packages/jsii/test/negatives/neg.property-name.1.ts +++ b/packages/jsii/test/negatives/neg.property-name.1.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: PROP +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: PROP export class MyClass { public PROP?: number; diff --git a/packages/jsii/test/negatives/neg.property-name.2.ts b/packages/jsii/test/negatives/neg.property-name.2.ts index 612a4828a4..43e07eeec0 100644 --- a/packages/jsii/test/negatives/neg.property-name.2.ts +++ b/packages/jsii/test/negatives/neg.property-name.2.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: my_Prop +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: my_Prop export class MyClass { public my_Prop?: number; diff --git a/packages/jsii/test/negatives/neg.static-method-name.1.ts b/packages/jsii/test/negatives/neg.static-method-name.1.ts index ca3671dbf3..4e90570bac 100644 --- a/packages/jsii/test/negatives/neg.static-method-name.1.ts +++ b/packages/jsii/test/negatives/neg.static-method-name.1.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: MethodIsNotCamelCase +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: MethodIsNotCamelCase export class MyClass { MethodIsNotCamelCase() { diff --git a/packages/jsii/test/negatives/neg.static-method-name.ts b/packages/jsii/test/negatives/neg.static-method-name.ts index 5d3fcb0422..2d07c4eeee 100644 --- a/packages/jsii/test/negatives/neg.static-method-name.ts +++ b/packages/jsii/test/negatives/neg.static-method-name.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: METHOD +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: METHOD export class MyClass { METHOD() { diff --git a/packages/jsii/test/negatives/neg.static-prop-name.1.ts b/packages/jsii/test/negatives/neg.static-prop-name.1.ts index dd5e8b0ec8..a576492047 100644 --- a/packages/jsii/test/negatives/neg.static-prop-name.1.ts +++ b/packages/jsii/test/negatives/neg.static-prop-name.1.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: Prop +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: Prop export class MyClass { static get Prop() { diff --git a/packages/jsii/test/negatives/neg.static-prop-name.2.ts b/packages/jsii/test/negatives/neg.static-prop-name.2.ts index 4551e14a1f..b22b20a14a 100644 --- a/packages/jsii/test/negatives/neg.static-prop-name.2.ts +++ b/packages/jsii/test/negatives/neg.static-prop-name.2.ts @@ -1,4 +1,4 @@ -///!MATCH_ERROR: Method and property names must use camelCase: PROP +///!MATCH_ERROR: Method and non-static non-readonly property names must use camelCase: PROP export class MyClass { static get PROP() {