Skip to content

Commit 3ed1c3a

Browse files
committed
Merge branch 'master' into canvas-drawer
1 parent 40d3bc3 commit 3ed1c3a

Some content is hidden

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

55 files changed

+9311
-9232
lines changed

.eslintrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "eslint-config-atomic",
3+
"ignorePatterns": ["dist/", "node_modules/", "spec/fixtures"]
4+
}

.github/workflows/CI.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,40 @@ jobs:
3636
apm install --production
3737
npm install --only=dev
3838
39-
- name: Run Ubuntu tests
40-
if: ${{ contains(matrix.os, 'ubuntu') }}
41-
run: npm run build.test && npm run test
42-
43-
# One or two of the tests are flaky on Windows/MacOs
44-
- name: Run Windows and MacOS tests
45-
if: ${{ !contains(matrix.os, 'ubuntu') }}
46-
continue-on-error: true
39+
- name: Run tests
4740
run: npm run build.test && npm run test
4841

4942
Lint:
5043
if: "!contains(github.event.head_commit.message, '[skip ci]')"
5144
runs-on: ubuntu-latest
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5247
steps:
5348
- uses: actions/checkout@v2
5449
with:
5550
fetch-depth: 0
56-
- uses: actions/setup-node@v2
51+
- name: Commit lint ✨
52+
uses: wagoid/commitlint-github-action@v2
53+
54+
- uses: UziTech/action-setup-atom@v1
55+
- name: Setup PNPM
56+
uses: pnpm/[email protected]
5757
with:
58-
node-version: "12.x"
59-
- name: Install NPM dependencies
60-
run: |
61-
npm install --ignore-scripts
58+
version: latest
59+
60+
- name: Install dependencies
61+
run: pnpm install
62+
63+
- name: Format ✨
64+
run: pnpm test.format
65+
6266
- name: Lint ✨
63-
run: npm run lint
67+
run: pnpm test.lint
6468

6569
Release:
6670
needs: [Test, Lint]
6771
if: github.ref == 'refs/heads/master' &&
68-
github.event.repository.fork == false
72+
github.event.repository.fork == false && !contains(github.event.head_commit.message, '[skip release]')
6973
runs-on: ubuntu-latest
7074
steps:
7175
- uses: actions/checkout@v2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ node_modules
55
pages
66
dist
77
.parcel-cache
8+
package-lock.json

.npmrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
public-hoist-pattern[]=*
2+
package-lock=false
3+
lockfile=true

.prettierignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
node_modules
2+
package.json
3+
package-lock.json
4+
pnpm-lock.yaml
5+
changelog.md
6+
coverage
7+
build
8+
dist

.tern-project

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"ecmaVersion": 7,
3-
"libs": [
4-
"jquery"
5-
],
3+
"libs": ["jquery"],
64
"plugins": {
75
"complete_strings": {
86
"maxLength": 15
@@ -25,4 +23,4 @@
2523
"es_modules": {},
2624
"commonjs": {}
2725
}
28-
}
26+
}

.terserrc.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@ const isReadable = process.env.READABLE_BUILD || isDev || isTest
44

55
export default {
66
// "module": false, // controlled by Parcel
7-
"compress": {
8-
"global_defs": {
7+
compress: {
8+
global_defs: {
99
// remove spec specific code for production
10-
"@atom.inSpecMode": !isTest ? "() => false" : "() => true"
10+
"@atom.inSpecMode": !isTest ? "() => false" : "() => true",
1111
},
12-
"ecma": "2018", // Change based on the target
13-
// "toplevel": true, // controlled by Parcel
14-
"hoist_vars": false,
15-
"hoist_funs": true,
16-
"pure_getters": true,
17-
"unsafe": true,
18-
"unsafe_arrows": true,
19-
"unsafe_comps": true,
20-
"unsafe_Function": true,
21-
"unsafe_math": true,
22-
"unsafe_symbols": true,
23-
"unsafe_methods": true,
24-
"unsafe_proto": true,
25-
"unsafe_regexp": true,
26-
"unsafe_undefined": true,
27-
"passes": isDev ? 0 : 2,
12+
ecma: "2018", // Change based on the target
13+
toplevel: false,
14+
hoist_vars: false,
15+
hoist_funs: true,
16+
pure_getters: true,
17+
unsafe: true,
18+
unsafe_arrows: true,
19+
unsafe_comps: true,
20+
unsafe_Function: true,
21+
unsafe_math: true,
22+
unsafe_symbols: true,
23+
unsafe_methods: true,
24+
unsafe_proto: true,
25+
unsafe_regexp: true,
26+
unsafe_undefined: true,
27+
passes: isDev ? 0 : 2,
2828
},
29-
"parse": {
30-
"ecma": 2020
29+
parse: {
30+
ecma: 2020,
3131
},
32-
"mangle": isReadable ? false : true,
33-
"format": {
34-
"beautify": isReadable
32+
mangle: isReadable ? false : true,
33+
format: {
34+
beautify: isReadable,
3535
},
3636
}

CHANGELOG.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,131 @@
1+
## [4.39.10](https://github.com/atom-minimap/minimap/compare/v4.39.9...v4.39.10) (2021-03-12)
2+
3+
4+
### Bug Fixes
5+
6+
* disable desynchronized canvas ([8059189](https://github.com/atom-minimap/minimap/commit/8059189e862f440d7a6bc5377e60d66b0b49a632))
7+
8+
## [4.39.9](https://github.com/atom-minimap/minimap/compare/v4.39.8...v4.39.9) (2021-02-19)
9+
10+
11+
### Bug Fixes
12+
13+
* invalidate styles cache on styles update ([12b1b07](https://github.com/atom-minimap/minimap/commit/12b1b07a25a1ae12ae34f109d089e4ea8fb3cb03))
14+
15+
## [4.39.8](https://github.com/atom-minimap/minimap/compare/v4.39.7...v4.39.8) (2021-02-09)
16+
17+
18+
### Bug Fixes
19+
20+
* fix minimap on left calculate width ([4133274](https://github.com/atom-minimap/minimap/commit/4133274b8f011971a6ec8c08a4f8d71d5a9a0f07))
21+
22+
## [4.39.7](https://github.com/atom-minimap/minimap/compare/v4.39.6...v4.39.7) (2021-02-02)
23+
24+
25+
### Bug Fixes
26+
27+
* view provider returns correct minimap element ([#781](https://github.com/atom-minimap/minimap/issues/781)) ([358d781](https://github.com/atom-minimap/minimap/commit/358d781114d85f5214cfdf46433dba9d33a6b5c2))
28+
29+
## [4.39.6](https://github.com/atom-minimap/minimap/compare/v4.39.5...v4.39.6) (2021-01-30)
30+
31+
### Bug fixes
32+
- fix: do not null set the values in destroy (#779): solves some of the null bugs.
33+
34+
## [4.39.5](https://github.com/atom-minimap/minimap/compare/v4.39.4...v4.39.5) (2021-01-18)
35+
36+
37+
### Bug Fixes
38+
39+
* fix strange null-bugs (#771)
40+
* fix `getDecorations` should return an array
41+
42+
43+
## [4.39.4](https://github.com/atom-minimap/minimap/compare/v4.39.3...v4.39.4) (2021-01-18)
44+
45+
46+
### Bug Fixes
47+
48+
* revert "fix: skip rendering empty token text" ([86767a0](https://github.com/atom-minimap/minimap/commit/86767a08dde8d7eb2d6c3931862ea8f0c4a86900))
49+
50+
## [4.39.3](https://github.com/atom-minimap/minimap/compare/v4.39.2...v4.39.3) (2021-01-18)
51+
52+
53+
### Bug Fixes
54+
55+
* skip rendering empty token text ([6bd1921](https://github.com/atom-minimap/minimap/commit/6bd1921213b7bce935f21340a0aee42b909a78ab))
56+
57+
## [4.39.2](https://github.com/atom-minimap/minimap/compare/v4.39.1...v4.39.2) (2021-01-18)
58+
59+
60+
### Bug Fixes
61+
62+
* add minimap.destroy to minimapForEditor just in case ([40a4676](https://github.com/atom-minimap/minimap/commit/40a467623a257732f54824e7a8a99f14ade706c9))
63+
* dispose the editorSubscription if minimap is deactivated before destroying the editor ([7b359b3](https://github.com/atom-minimap/minimap/commit/7b359b364343fb575e46fcee41b9812a553ecfb1))
64+
65+
## [4.39.1](https://github.com/atom-minimap/minimap/compare/v4.39.0...v4.39.1) (2021-01-17)
66+
67+
68+
### Bug Fixes
69+
70+
* add DecorationManagement.destroy ([09e64b9](https://github.com/atom-minimap/minimap/commit/09e64b9b0141dc3e7d5a76aa6a5246975c8a3de2))
71+
* attach to text editor explicitly ([f2c36b7](https://github.com/atom-minimap/minimap/commit/f2c36b759bf33cbd6b374ed60901452e600ac0c0))
72+
* clear editorsMinimaps in one take ([aa48eba](https://github.com/atom-minimap/minimap/commit/aa48eba2a0c151c194845704fe82cd79c95fa7cf))
73+
* compare minimap with undefined ([ad83bf6](https://github.com/atom-minimap/minimap/commit/ad83bf66448d11761b10c04799bc15fc7141fe16))
74+
* create a new Minimap if it is destroyed ([503c482](https://github.com/atom-minimap/minimap/commit/503c482ffc1e85cbb83a52570e4930300c893f87))
75+
* delete the editor from editorsMinimaps if destroyed ([defc58c](https://github.com/atom-minimap/minimap/commit/defc58ced3b29cd8a414c5e67993900c20ecc521))
76+
* destroy quickSettingsElement ([0eace20](https://github.com/atom-minimap/minimap/commit/0eace2096f47c59e84d93dbb72eb601fb4a154bd))
77+
* do not define additional subs variable ([2b665ec](https://github.com/atom-minimap/minimap/commit/2b665ec259798dd9ed3b439c375068f7538f5601))
78+
* hack for forcing scroller movement ([a5ac5ec](https://github.com/atom-minimap/minimap/commit/a5ac5ec950cd4ac168ff0e24a0a5c3cbd8772410))
79+
* merge subs.add in Minimap ([5a9ff08](https://github.com/atom-minimap/minimap/commit/5a9ff0820ddb65074e9e6e9f53589df3c090f028))
80+
* merge subs.add in quick settings ([4e81b4c](https://github.com/atom-minimap/minimap/commit/4e81b4c56c0767fe58b320f7059a99d4d40ee450))
81+
* only delete if editorsMinimaps is not null ([464a8cf](https://github.com/atom-minimap/minimap/commit/464a8cfc371524c950c875b030009dc250c981d0))
82+
* remove excess copy ([4fca672](https://github.com/atom-minimap/minimap/commit/4fca672d1e3e02f0203fa19b3fb7de6ed3e3eac6))
83+
* removeChild before appending ([1d07ed1](https://github.com/atom-minimap/minimap/commit/1d07ed154be2f1d5b864f9f972bf155845160513))
84+
* reuse minimapElement if already exists ([1043a29](https://github.com/atom-minimap/minimap/commit/1043a29f3721beb11871639febc1b298e6519193))
85+
* set minimap to null if it is truthy ([3f683d9](https://github.com/atom-minimap/minimap/commit/3f683d9305fd770f0723d0b216ecea083cadbbc5))
86+
* use minimapViewProvider instead of atom.views ([6fb75af](https://github.com/atom-minimap/minimap/commit/6fb75aff8feff0f7dc0c16db64ca029a0acd6e9c))
87+
88+
# [4.39.0](https://github.com/atom-minimap/minimap/compare/v4.38.3...v4.39.0) (2021-01-16)
89+
90+
91+
### Bug Fixes
92+
93+
* add destroyed prop to DecorationManagement ([784732d](https://github.com/atom-minimap/minimap/commit/784732df2a84b88d4ac6bb76e09ecd971c5ad6a6))
94+
* call initializeDecorations inside setModel ([006300c](https://github.com/atom-minimap/minimap/commit/006300c89c4b0019a50c2559cf6c794583336a7c))
95+
* destructure data in drawGutterDecoration ([c055f0e](https://github.com/atom-minimap/minimap/commit/c055f0eaac32a173539b8ebbbf3936e3a736ac1f))
96+
* destructure data in drawLineDecoration ([7579528](https://github.com/atom-minimap/minimap/commit/7579528abf74823927991b4f3475050d9c7c7e3a))
97+
* destructure renderData in drawHighlightDecoration ([8033509](https://github.com/atom-minimap/minimap/commit/80335099d5886bd60afe0259b7d659cb11971da5))
98+
* destructure renderData in drawHighlightOutlineDecoration ([be58182](https://github.com/atom-minimap/minimap/commit/be5818245328f185fd87200bc8a721211928e71f))
99+
* duplicate functions for backward compatibility ([67d9d58](https://github.com/atom-minimap/minimap/commit/67d9d587511ce1cad8321c82ec3562983e1d2ad5))
100+
* empty minimapElement once minimapElement is destroyed ([c5ac30c](https://github.com/atom-minimap/minimap/commit/c5ac30ca7aa8d32dcfd5eaf23d10665693343be2))
101+
* fix onDidChangeDecorationRange ([b331f08](https://github.com/atom-minimap/minimap/commit/b331f08609008b8f849555e4b5fd33bd7d81f3f2))
102+
* make DecorationManagement a normal class ([a303916](https://github.com/atom-minimap/minimap/commit/a3039161141fa9a500efeed456b3db0117839682))
103+
* memoize this.DecorationManagement ([5d4c1dc](https://github.com/atom-minimap/minimap/commit/5d4c1dc1f294e1310c7f6f562189774e2062070d))
104+
* memoize this.emitter ([6235c2e](https://github.com/atom-minimap/minimap/commit/6235c2ef36b84d8aa69365cff9d02f1c01d0fc29))
105+
* set this.DecorationManagement to undefined ([b9e351c](https://github.com/atom-minimap/minimap/commit/b9e351c9270c43b9e6c810528cf8e2a93eb8279d))
106+
* use this.minimap.destroyed ([38a0e3f](https://github.com/atom-minimap/minimap/commit/38a0e3f8bf908c46776a4844d42a7174fb9c6482))
107+
* use this.minimap.editorDestroyed ([9385892](https://github.com/atom-minimap/minimap/commit/938589282e26594c9d53a56c86eab233892e6c22))
108+
* use this.minimap.emitter ([f34cd85](https://github.com/atom-minimap/minimap/commit/f34cd85f37b25a2f4c1a856b33ec0bbcfca7bf36))
109+
* use this.minimap.get visibleRow ([ea3fc7b](https://github.com/atom-minimap/minimap/commit/ea3fc7b6455985fbd53e42a3abad9a6db9ef129a))
110+
111+
112+
### Features
113+
114+
* add getDecorationManagement as the recommended way of using decoration API ([46080b3](https://github.com/atom-minimap/minimap/commit/46080b3481a4dc36a4cbbb734b6fa6ae9191aa6f))
115+
* set minimapElement property for Minimap ([03726ed](https://github.com/atom-minimap/minimap/commit/03726ede6950bc94259473110d41ef2bf9a2e746))
116+
117+
## [4.38.3](https://github.com/atom-minimap/minimap/compare/v4.38.2...v4.38.3) (2021-01-12)
118+
119+
120+
### Bug Fixes
121+
122+
* make underscore-plus a devDep ([07512f3](https://github.com/atom-minimap/minimap/commit/07512f32aca7e30a6a3f52332f62e1241d565e1a))
123+
* no need escape / ([2687541](https://github.com/atom-minimap/minimap/commit/2687541b53e6b8f6c2b466b4f37f365f9b506c86))
124+
* replace underscore-plus by custom implementation ([2ee74b9](https://github.com/atom-minimap/minimap/commit/2ee74b9c730e6836a8c3e00b64681a305598b6e6))
125+
* store the regexp in a const ([2a64ecb](https://github.com/atom-minimap/minimap/commit/2a64ecbd76db73bf2bb2fd3571d21b8e246308dd))
126+
* turn-off toplevel optimizations ([0099863](https://github.com/atom-minimap/minimap/commit/009986300506416aa30b3f1c9a326f6160cceb19))
127+
* use string inerpolation ([92be9d8](https://github.com/atom-minimap/minimap/commit/92be9d8c538eb21dbc5ed4931c9aa47afa79ea92))
128+
1129
## [4.38.2](https://github.com/atom-minimap/minimap/compare/v4.38.1...v4.38.2) (2021-01-12)
2130

3131

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
When suggesting edits to the Minimap package try to follow the [Atom contribution guidelines](https://github.com/atom/atom/blob/master/CONTRIBUTING.md).
44

5-
Especially important is that the commits follow the conventions defined in the *Git Commit Messages* section of the guideline.
5+
Especially important is that the commits follow the conventions defined in the _Git Commit Messages_ section of the guideline.
66

77
The `CHANGELOG` content is then generated using the [changelog-gen utils](https://github.com/abe33/changelog-gen).
88

0 commit comments

Comments
 (0)