Skip to content

Commit

Permalink
Revert the member ordering changes
Browse files Browse the repository at this point in the history
Revert "Exempt type literals from the alpha sorting"
This reverts commit 8ad842f.

Revert "Add two new eslint rules and fix some errors"
This reverts commit 736b71d.
  • Loading branch information
kmoschcau committed May 24, 2021
1 parent 426ecd8 commit fe6b034
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 81 deletions.
65 changes: 0 additions & 65 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,73 +10,8 @@ module.exports = {
},
plugins: ['@typescript-eslint', 'eslint-plugin-tsdoc'],
rules: {
'eslint/lines-between-class-members': 'off',
'tsdoc/syntax': 'warn',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/lines-between-class-members': ['error'],
'@typescript-eslint/member-ordering': [
'warn',
{
default: {
memberTypes: [
'public-static-field',
'protected-static-field',
'private-static-field',
'static-field',

// static accessors go here

'public-static-method',
'protected-static-method',
'private-static-method',
'static-method',

'public-constructor',
'protected-constructor',
'private-constructor',
'constructor',

'signature',

'public-instance-field',
'protected-instance-field',
'private-instance-field',
'instance-field',

// instance accessors go here

'public-abstract-field',
'protected-abstract-field',
'private-abstract-field',
'abstract-field',

'public-instance-method',
'protected-instance-method',
'private-instance-method',
'instance-method',

'public-abstract-method',
'protected-abstract-method',
'private-abstract-method',
'abstract-method',

'public-field',
'protected-field',
'private-field',
'field',

'public-method',
'protected-method',
'private-method',
'method'
],
order: 'alphabetically'
},
typeLiterals: {
order: 'as-written'
}
}
],
'@typescript-eslint/no-explicit-any': 'off'
}
};
2 changes: 0 additions & 2 deletions src/foundry/avMaster.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,10 @@ declare class AVMaster {
* @defaultValue `{}`
*/
protected _speakingData: AVMaster.SpeakingData;

/**
* @defaultValue `{}`
*/
protected _pttHandlers: AVMaster.PTTHandlers;

/**
* @defaultValue `0`
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ declare class LightingLayer extends PlaceablesLayer<AmbientLight> {
* A mapping of different light level channels
*/
channels: Record<'background' | 'black' | 'bright' | 'canvas' | 'dark' | 'dim', LightChannel>;

/**
* The currently displayed darkness level, which may override the saved Scene value
*/
Expand Down
1 change: 0 additions & 1 deletion src/foundry/pixi/containers/placeableObjects/drawing.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ declare class Drawing extends PlaceableObject<Drawing.Data> {
* Internal timestamp for the previous freehand draw time, to limit sampling
*/
protected _drawTime: number;

protected _sampleTime: number;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
declare class MeasuredTemplate extends PlaceableObject<MeasuredTemplate.Data> {
// Draw portions of the content
controlIcon: ControlIcon | null;

template: PIXI.Graphics | null;

ruler: PreciseText | null;

/**
Expand Down
1 change: 0 additions & 1 deletion src/foundry/pixi/containers/placeableObjects/wall.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ declare class Wall extends PlaceableObject<Wall.Data> {
* @remarks Not used for `Wall`
*/
controlIcon: null;

/**
* @remarks Type is `MouseInteractionManager<this, this['endpoints']>`
*/
Expand Down
1 change: 0 additions & 1 deletion src/foundry/pixi/texts/preciseText.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
*/
declare class PreciseText extends PIXI.Text {
_autoResolution: false;

_resolution: 2;
}
3 changes: 0 additions & 3 deletions src/foundry/ray.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ declare class Ray {

// Points
A: Point;

B: Point;

// Origins
x0: number;

y0: number;

// Slopes
dx: number;

dy: number;

/**
Expand Down
5 changes: 0 additions & 5 deletions test-d/foundry/pixi/containers/placeableObject.test-d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ import '../../../../index';

class NoIcon extends PlaceableObject {
controlIcon!: null;

get bounds(): NormalizedRectangle {
throw new Error('Not implemented');
}

async draw() {
return this;
}

refresh() {
return this;
}
Expand All @@ -22,11 +19,9 @@ class HasIcon extends PlaceableObject {
get bounds(): NormalizedRectangle {
throw new Error('Not implemented');
}

async draw() {
return this;
}

refresh() {
return this;
}
Expand Down

0 comments on commit fe6b034

Please sign in to comment.