Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

BugFix: CLIEngine is not constructor when format called #1271

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,25 @@
"contributions": [
"code"
]
},
{
"login": "pbardov",
"name": "pbardov",
"avatar_url": "https://avatars.githubusercontent.com/u/6674508?v=4",
"profile": "https://github.com/pbardov",
"contributions": [
"bug",
"code",
"design",
"doc",
"example",
"review",
"security",
"talk",
"test"
]
}
],
"repoType": "github"
"repoType": "github",
"commitConvention": "none"
}
12 changes: 11 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"presets": [["@babel/env", { "targets": { "electron": "1.4" } }]],
"presets": [
[
"@babel/env",
{
"targets": {
"electron": "1.4"
}
}
],
"@babel/preset-flow"
],
"plugins": [
"@babel/transform-flow-strip-types",
"@babel/plugin-transform-runtime",
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extends:
- plugin:jest/recommended
- prettier

parser: babel-eslint
parser: "@babel/eslint-parser"

plugins:
- flowtype
Expand Down
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[ignore]
dist
.*/node_modules/.*/malformed_package_json/.*

[include]

Expand Down
59 changes: 52 additions & 7 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/displayDebugInfo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Atom version: ${getAtomVersion()}
prettier-atom version: ${getPackageInfo(__dirname).version}
prettier: ${globalPrettierPath || 'bundled'}
prettier version: ${getPackageInfo(globalPrettierPath || getDepPath('prettier')).version}
prettier-eslint version: ${getPackageInfo(getDepPath('@lewisl9029/prettier-eslint')).version}
prettier-eslint version: ${getPackageInfo(getDepPath('prettier-eslint')).version}
prettier-atom configuration: ${JSON.stringify(getPrettierAtomConfig(), null, 2)}
`.trim();
};
Expand Down
8 changes: 4 additions & 4 deletions dist/executePrettier/executePrettierOnBufferRange.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/

var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));

function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

const _ = require('lodash/fp');

const prettierEslint = require('@lewisl9029/prettier-eslint');
const prettierEslint = require('prettier-eslint');

const prettierStylelint = require('prettier-stylelint');

Expand Down Expand Up @@ -83,7 +83,7 @@ const executePrettierOrIntegration = /*#__PURE__*/function () {

if (shouldUseEslint()) {
// TODO: add support for cursor position - https://github.com/prettier/prettier-eslint/issues/164
const formatted = executePrettierEslint(editor, text);
const formatted = yield executePrettierEslint(editor, text);
return {
formatted,
cursorOffset
Expand Down
8 changes: 4 additions & 4 deletions dist/executePrettier/executePrettierOnBufferRange.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de

var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));

function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

jest.mock('@lewisl9029/prettier-eslint');
jest.mock('prettier-eslint');
jest.mock('prettier-stylelint');
jest.mock('prettier');
jest.mock('../atomInterface');
Expand All @@ -20,7 +20,7 @@ jest.mock('./handleError');

const prettier = require('prettier');

const prettierEslint = require('@lewisl9029/prettier-eslint');
const prettierEslint = require('prettier-eslint');

const prettierStylelint = require('prettier-stylelint');

Expand Down
8 changes: 4 additions & 4 deletions dist/helpers/atomRelated.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"use strict";

const Point = require('atom-text-buffer-point');
const AtomTextBufferPoint = require('atom-text-buffer-point');

const Range = require('atom-text-buffer-range');
const AtomTextBufferRange = require('atom-text-buffer-range');

const createPoint = (row, column) => new Point(row, column);
const createPoint = (row, column) => new AtomTextBufferPoint(row, column);

const createRange = (start, end) => new Range(start, end);
const createRange = (start, end) => new AtomTextBufferRange(start, end);

module.exports = {
createPoint,
Expand Down
4 changes: 2 additions & 2 deletions dist/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau

var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));

function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }

function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }

const getPrettierInstance = require('./getPrettierInstance');

Expand Down
11 changes: 9 additions & 2 deletions flow-typed/npm/@babel/cli_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 761d76764fc2de240a7b524bde3277f1
// flow-typed version: <<STUB>>/@babel/cli_v^7.14.5/flow_v0.158.0
// flow-typed signature: 5cc71d35a116db464206ded9e10aaa1a
// flow-typed version: <<STUB>>/@babel/cli_v^7.17.10/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
Expand Down Expand Up @@ -54,6 +54,10 @@ declare module '@babel/cli/lib/babel/util' {
declare module.exports: any;
}

declare module '@babel/cli/lib/babel/watcher' {
declare module.exports: any;
}

// Filename aliases
declare module '@babel/cli/bin/babel-external-helpers.js' {
declare module.exports: $Exports<'@babel/cli/bin/babel-external-helpers'>;
Expand Down Expand Up @@ -88,3 +92,6 @@ declare module '@babel/cli/lib/babel/options.js' {
declare module '@babel/cli/lib/babel/util.js' {
declare module.exports: $Exports<'@babel/cli/lib/babel/util'>;
}
declare module '@babel/cli/lib/babel/watcher.js' {
declare module.exports: $Exports<'@babel/cli/lib/babel/watcher'>;
}
25 changes: 23 additions & 2 deletions flow-typed/npm/@babel/core_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 350e331759a1bddb94dce3f54ab3b096
// flow-typed version: <<STUB>>/@babel/core_v^7.15.0/flow_v0.158.0
// flow-typed signature: fbff68552a5c91f07941c266ca9947a3
// flow-typed version: <<STUB>>/@babel/core_v^7.17.10/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
Expand Down Expand Up @@ -42,6 +42,10 @@ declare module '@babel/core/lib/config/files/configuration' {
declare module.exports: any;
}

declare module '@babel/core/lib/config/files/import-meta-resolve' {
declare module.exports: any;
}

declare module '@babel/core/lib/config/files/import' {
declare module.exports: any;
}
Expand Down Expand Up @@ -82,6 +86,10 @@ declare module '@babel/core/lib/config/helpers/config-api' {
declare module.exports: any;
}

declare module '@babel/core/lib/config/helpers/deep-array' {
declare module.exports: any;
}

declare module '@babel/core/lib/config/helpers/environment' {
declare module.exports: any;
}
Expand Down Expand Up @@ -222,6 +230,10 @@ declare module '@babel/core/lib/transformation/util/clone-deep' {
declare module.exports: any;
}

declare module '@babel/core/lib/vendor/import-meta-resolve' {
declare module.exports: any;
}

// Filename aliases
declare module '@babel/core/lib/config/cache-contexts.js' {
declare module.exports: $Exports<'@babel/core/lib/config/cache-contexts'>;
Expand All @@ -238,6 +250,9 @@ declare module '@babel/core/lib/config/config-descriptors.js' {
declare module '@babel/core/lib/config/files/configuration.js' {
declare module.exports: $Exports<'@babel/core/lib/config/files/configuration'>;
}
declare module '@babel/core/lib/config/files/import-meta-resolve.js' {
declare module.exports: $Exports<'@babel/core/lib/config/files/import-meta-resolve'>;
}
declare module '@babel/core/lib/config/files/import.js' {
declare module.exports: $Exports<'@babel/core/lib/config/files/import'>;
}
Expand Down Expand Up @@ -271,6 +286,9 @@ declare module '@babel/core/lib/config/full.js' {
declare module '@babel/core/lib/config/helpers/config-api.js' {
declare module.exports: $Exports<'@babel/core/lib/config/helpers/config-api'>;
}
declare module '@babel/core/lib/config/helpers/deep-array.js' {
declare module.exports: $Exports<'@babel/core/lib/config/helpers/deep-array'>;
}
declare module '@babel/core/lib/config/helpers/environment.js' {
declare module.exports: $Exports<'@babel/core/lib/config/helpers/environment'>;
}
Expand Down Expand Up @@ -388,3 +406,6 @@ declare module '@babel/core/lib/transformation/util/clone-deep-browser.js' {
declare module '@babel/core/lib/transformation/util/clone-deep.js' {
declare module.exports: $Exports<'@babel/core/lib/transformation/util/clone-deep'>;
}
declare module '@babel/core/lib/vendor/import-meta-resolve.js' {
declare module.exports: $Exports<'@babel/core/lib/vendor/import-meta-resolve'>;
}
18 changes: 18 additions & 0 deletions flow-typed/npm/@babel/eslint-parser_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// flow-typed signature: d9dd8c5c297f5c7902cc11fd01e8f3d5
// flow-typed version: <<STUB>>/@babel/eslint-parser_v^7.17.0/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
*
* '@babel/eslint-parser'
*
* Fill this stub out by replacing all the `any` types.
*
* Once filled out, we encourage you to share your work with the
* community by sending a pull request to:
* https://github.com/flowtype/flow-typed
*/

declare module '@babel/eslint-parser' {
declare module.exports: any;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 4c30d7f3713e4b1bc05532467530d187
// flow-typed version: <<STUB>>/@babel/plugin-proposal-object-rest-spread_v^7.14.5/flow_v0.158.0
// flow-typed signature: 267aa942b34c4ad94e312bd44da611cb
// flow-typed version: <<STUB>>/@babel/plugin-proposal-object-rest-spread_v^7.14.5/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 09f533394a72787af05856165d25b657
// flow-typed version: <<STUB>>/@babel/plugin-transform-flow-strip-types_v^7.14.5/flow_v0.158.0
// flow-typed signature: 68bf6dce3337a556f89216896c51160d
// flow-typed version: <<STUB>>/@babel/plugin-transform-flow-strip-types_v^7.16.5/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/@babel/plugin-transform-runtime_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: 6ca4a0d73eda7606618ec6a735024dcd
// flow-typed version: <<STUB>>/@babel/plugin-transform-runtime_v^7.15.0/flow_v0.158.0
// flow-typed signature: 99f80274e6a46c7dd5d160e2a37a34f0
// flow-typed version: <<STUB>>/@babel/plugin-transform-runtime_v^7.16.5/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
Expand Down
4 changes: 2 additions & 2 deletions flow-typed/npm/@babel/preset-env_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// flow-typed signature: b7676cd6a212309ce93ef380e9285ec2
// flow-typed version: <<STUB>>/@babel/preset-env_v^7.14.5/flow_v0.158.0
// flow-typed signature: 5d94dfe400c3d624cf25f5d5ef3c1c8b
// flow-typed version: <<STUB>>/@babel/preset-env_v^7.16.5/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
Expand Down
42 changes: 42 additions & 0 deletions flow-typed/npm/@babel/preset-flow_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// flow-typed signature: ce735d240678d4b7fff49f02be490873
// flow-typed version: <<STUB>>/@babel/preset-flow_v^7.0.0/flow_v0.167.1

/**
* This is an autogenerated libdef stub for:
*
* '@babel/preset-flow'
*
* Fill this stub out by replacing all the `any` types.
*
* Once filled out, we encourage you to share your work with the
* community by sending a pull request to:
* https://github.com/flowtype/flow-typed
*/

declare module '@babel/preset-flow' {
declare module.exports: any;
}

/**
* We include stubs for each file inside this npm package in case you need to
* require those files directly. Feel free to delete any files that aren't
* needed.
*/
declare module '@babel/preset-flow/lib' {
declare module.exports: any;
}

declare module '@babel/preset-flow/lib/normalize-options' {
declare module.exports: any;
}

// Filename aliases
declare module '@babel/preset-flow/lib/index' {
declare module.exports: $Exports<'@babel/preset-flow/lib'>;
}
declare module '@babel/preset-flow/lib/index.js' {
declare module.exports: $Exports<'@babel/preset-flow/lib'>;
}
declare module '@babel/preset-flow/lib/normalize-options.js' {
declare module.exports: $Exports<'@babel/preset-flow/lib/normalize-options'>;
}
Loading