daffodil-vscode.git
12 months agoadd yarn compile to nightly action to fix issue (#110)
Shane Dell [Fri, 27 Aug 2021 18:14:50 +0000 (14:14 -0400)] 
add yarn compile to nightly action to fix issue (#110)

12 months agofix version (#112)
John Wass [Fri, 27 Aug 2021 18:14:17 +0000 (14:14 -0400)] 
fix version (#112)

13 months agoCheck for pre- or -pre in tag. Add GIT_ID to extension name for nightly build (#109)
Shane Dell [Fri, 27 Aug 2021 14:11:43 +0000 (10:11 -0400)] 
Check for pre- or -pre in tag. Add GIT_ID to extension name for nightly build (#109)

13 months agoOptions reordering (#107)
Shane Dell [Fri, 27 Aug 2021 11:57:11 +0000 (07:57 -0400)] 
Options reordering (#107)

* Make sure that if the user selects to run the file pickers that the extension will wait till they are select before starting.
* Fix out of order issue

13 months agoHexview Arrow Icon (#105)
Shane Dell [Thu, 26 Aug 2021 10:56:51 +0000 (06:56 -0400)] 
Hexview Arrow Icon (#105)

Fix arrow icon pathing

13 months agoAdd dfdl snippets (#104)
John Wass [Thu, 26 Aug 2021 01:59:01 +0000 (21:59 -0400)] 
Add dfdl snippets (#104)

* Add dfdl snippets

* bump version

Co-authored-by: Regis Thomas <regis.thomas@nteligen.com>
Co-authored-by: Shane Dell <shanedell100@gmail.com>
13 months agoPrettier (#103)
John Wass [Thu, 26 Aug 2021 01:45:30 +0000 (21:45 -0400)] 
Prettier (#103)

* add prettier config and vscode format on save

* format src/ with prettier

* no-semi prettier config

* format src/ with no-semi config

* ci

* add files.insertFinalNewline

13 months agoLint Checking (#102)
Shane Dell [Wed, 25 Aug 2021 10:17:28 +0000 (06:17 -0400)] 
Lint Checking (#102)

* Create typescript github action. Create lint rule for indents

* Fix lint issues

13 months agoUpdate package name (#100)
John Wass [Wed, 25 Aug 2021 00:00:07 +0000 (20:00 -0400)] 
Update package name (#100)

* bump to v0.0.11 and update package name

closes #84

* Clean up ignores (#85)

* missed some package name related changes

* version number

* bump version after testing

13 months agoDisable loaded sources support.
Adam Rosien [Tue, 24 Aug 2021 22:17:32 +0000 (15:17 -0700)] 
Disable loaded sources support.

Fixes #95.
Infoset and data position info are relayed via custom events instead of backend-managed DAP sources.

13 months agoMerge branch 'master' of https://github.com/jw3/example-daffodil-vscode
Adam Rosien [Tue, 24 Aug 2021 19:18:09 +0000 (12:18 -0700)] 
Merge branch 'master' of https://github.com/jw3/example-daffodil-vscode

13 months agoFix issue for killing java in windows (#96)
Shane Dell [Tue, 24 Aug 2021 19:17:10 +0000 (15:17 -0400)] 
Fix issue for killing java in windows (#96)

13 months agoEnsure DAP events queue is terminated after parse completes.
Adam Rosien [Tue, 24 Aug 2021 19:17:02 +0000 (12:17 -0700)] 
Ensure DAP events queue is terminated after parse completes.

Fixes #98.

13 months agoUpdate readme to refer to wiki (#92)
John Wass [Tue, 24 Aug 2021 16:17:56 +0000 (12:17 -0400)] 
Update readme to refer to wiki (#92)

13 months agoMonorepo extension and backend. (#76)
Adam Rosien [Fri, 20 Aug 2021 04:20:34 +0000 (21:20 -0700)] 
Monorepo extension and backend. (#76)

Monorepo of Typescript extension with Scala backend

* Prototype monorepo of Typescript extension with Scala backend.
* move scala source under server/core
* server build as submodules
* add daffodil to the artifact name
* Supply current version in src/version.ts via prebuild script.
* Download debugger backend that matches extension version.
* change repo from debug to vscode
* Fix location of dapodil bin folder
* ensure version matches the tag being pushed

Co-authored-by: John Wass <wassj@ctc.com>
Co-authored-by: Shane Dell <shanedell100@gmail.com>
13 months agoUpdate version to 0.0.10 (#81)
Shane Dell [Tue, 17 Aug 2021 02:31:49 +0000 (22:31 -0400)] 
Update version to 0.0.10 (#81)

* bump to 0.0.10 for next release to be made

13 months agoSnippet placeholder (#75)
Shane Dell [Wed, 11 Aug 2021 19:38:09 +0000 (15:38 -0400)] 
Snippet placeholder (#75)

Demonstrates the integration of snippets into the extension.

13 months agoUse config event for data file resolution (#74)
John Wass [Tue, 10 Aug 2021 02:28:48 +0000 (22:28 -0400)] 
Use config event for data file resolution (#74)

* merge hexview types with daffodil types module

* add config event interface

* use config event to provide data file config to the hex view

* remove another reference to .dataFile

* remove stray comment

* clarify comment and remove async

* remove the write of the .dataFile from the data command

13 months agoUpdate Non-selection Actions (#70)
Shane Dell [Tue, 10 Aug 2021 00:13:38 +0000 (20:13 -0400)] 
Update Non-selection Actions (#70)

* update code to cancel launch if no daffodil debugger version selected. have the extension exit silently whenever a program file or data file is not chosen, so cancel button is clicked or exit out of windows

* make unit tests action not run on tags

* delete unneeded comments

* fix unit tests ci

* Make sure dataFile does not get prompted for if programFile was not selected

13 months agoInfoset view (#66)
John Wass [Mon, 9 Aug 2021 14:42:10 +0000 (10:42 -0400)] 
Infoset view (#66)

* virtual doc infoset view

commands
- display current
- save current to file
- diff against previous

* additional ops after saving and clean up commands

13 months agoUpdates to Hex View (#68)
Shane Dell [Mon, 9 Aug 2021 04:05:06 +0000 (00:05 -0400)] 
Updates to Hex View (#68)

- Update hex view to split up each byte by a space.
- Update hex view to only select the proper byte for variable bytePos1b.
- Update hex view to only open up at the start of debug.
- Update hex view to only update selection when the hexFile is opened.
- Reformatted some of the code that was a bit uncessary.
- Create command for displaying hexView
- Don't open hexView on debug start

13 months agoAdd titles to the file picker dialogs (#69)
Shane Dell [Fri, 6 Aug 2021 12:00:13 +0000 (08:00 -0400)] 
Add titles to the file picker dialogs (#69)

13 months agoHex View Fix (#56)
Shane Dell [Wed, 4 Aug 2021 12:10:52 +0000 (08:10 -0400)] 
Hex View Fix (#56)

* Fix issue where highlighted text and icon get stuck on a line, will now move down to the end of the file

* remove html and make it hex

* Move location of hex-file. Updated hexView so that if hexView is already create/opened on debug session start it will be closed then deleted, then once the hex file is remade from the data file it gets opened up. Remove setting of white text for selections.

* Select proper line in hex view when position updates.

Fixes #61.

Co-authored-by: Adam Rosien <adam@rosien.net>
14 months agoAdd yarn to local developer installation steps.
Adam Rosien [Mon, 26 Jul 2021 18:38:07 +0000 (11:38 -0700)] 
Add yarn to local developer installation steps.

14 months agoCreate Hex View (#53)
Shane Dell [Fri, 23 Jul 2021 14:36:34 +0000 (10:36 -0400)] 
Create Hex View (#53)

Fully implemented hex viewer working

14 months agosetup basic unit testing. Will need to update unit tests to be more specific (#52)
Shane Dell [Thu, 22 Jul 2021 23:47:42 +0000 (19:47 -0400)] 
setup basic unit testing. Will need to update unit tests to be more specific (#52)

14 months agoupdate the generate launch.json file to have other options in it (#51)
Shane Dell [Fri, 16 Jul 2021 00:47:49 +0000 (20:47 -0400)] 
update the generate launch.json file to have other options in it (#51)

* update the generate launch.json file to have other options in it

* update data option in launch json to allow the user to specify a folder and when a it is a folder a file explorer will be opened in the directory given

Co-authored-by: sdell <>
14 months agofix data file prompt (#50)
Shane Dell [Fri, 16 Jul 2021 00:44:09 +0000 (20:44 -0400)] 
fix data file prompt (#50)

14 months agodelete appveyor.yml
Shane Dell [Fri, 9 Jul 2021 01:40:01 +0000 (21:40 -0400)] 
delete appveyor.yml

14 months agofix auto launch configs (#40)
Shane Dell [Tue, 29 Jun 2021 13:20:36 +0000 (09:20 -0400)] 
fix auto launch configs (#40)

14 months agoVarious updates (#28)
Shane Dell [Mon, 28 Jun 2021 18:14:55 +0000 (14:14 -0400)] 
Various updates (#28)

- Add infoset output configuration
- Fix breakpoint configuration
- Add autogenerated launch configuration
- Fix debug point specification

15 months agoadd nightly build workflow (#32)
Shane Dell [Thu, 24 Jun 2021 13:52:24 +0000 (09:52 -0400)] 
add nightly build workflow (#32)

update nightly to run on branch push

fix install deps job

limit os to only 1 instead of 3, switch npm to yarn

fix package command

add checkout of repo

fix deploy release

update workflows and remove travis ci file

try to fix release file

fix release yml

fix release action

fix git-tag name used for file

fix git tag

try different way of getting the tag

15 months agoImproved installation and debug launch instructions.
Adam Rosien [Thu, 24 Jun 2021 00:57:03 +0000 (17:57 -0700)] 
Improved installation and debug launch instructions.

15 months agoBetter install instructions.
Adam Rosien [Fri, 18 Jun 2021 20:25:01 +0000 (13:25 -0700)] 
Better install instructions.

15 months agoupdate publishing info
John Wass [Fri, 18 Jun 2021 11:55:52 +0000 (07:55 -0400)] 
update publishing info

15 months agoAdd VSIX installation instructions to README.
Adam Rosien [Wed, 9 Jun 2021 22:31:10 +0000 (15:31 -0700)] 
Add VSIX installation instructions to README.

15 months agosend infoset output path
John Wass [Fri, 28 May 2021 18:41:19 +0000 (14:41 -0400)] 
send infoset output path

15 months agoremove bad whitespace
Shane Dell [Fri, 4 Jun 2021 18:00:04 +0000 (14:00 -0400)] 
remove bad whitespace

15 months agoupdate extension to download executable files to User_Home_Folder/daffodil-debug...
Shane Dell [Fri, 4 Jun 2021 17:58:56 +0000 (13:58 -0400)] 
update extension to download executable files to User_Home_Folder/daffodil-debug (#21)

update the downloading of the debugger files into the home directory to
work on windows

delete some bad white space and comments

update location of the downloaded files to go to tmp folder using os.tmpdir

update location of downloaded files

fix data directory name
`

get rid of information message

15 months agoUpdate readme.md
James Mangus [Thu, 3 Jun 2021 18:35:26 +0000 (14:35 -0400)] 
Update readme.md

Finished the table

15 months agoMerge pull request #19 from jw3/dapodil/v0.0.5
Shane Dell [Thu, 3 Jun 2021 14:47:47 +0000 (10:47 -0400)] 
Merge pull request #19 from jw3/dapodil/v0.0.5

dapodilVersion flag

15 months agochange dapodilDebugVersion to dapodilVersion
Shane Dell [Thu, 3 Jun 2021 14:46:50 +0000 (10:46 -0400)] 
change dapodilDebugVersion to dapodilVersion

15 months agoremove default value for the dapodilDebugVersion
Shane Dell [Wed, 2 Jun 2021 13:55:25 +0000 (09:55 -0400)] 
remove default value for the dapodilDebugVersion

15 months agoupdated code to make dapodilDebugVerion the latest version if it was not set. doing...
Shane Dell [Tue, 1 Jun 2021 22:35:34 +0000 (18:35 -0400)] 
updated code to make dapodilDebugVerion the latest version if it was not set. doing this allowed for certain error handling code to be deleted

15 months agoadd flag "dapodilDebugVersion" to package.json so that if in the launch.json it will...
Shane Dell [Tue, 1 Jun 2021 22:25:14 +0000 (18:25 -0400)] 
add flag "dapodilDebugVersion" to package.json so that if in the launch.json it will use that version for the debugger instead of prompting for the version

15 months agoMerge pull request #18 from jw3/16_17_fix
Shane Dell [Tue, 1 Jun 2021 21:41:25 +0000 (17:41 -0400)] 
Merge pull request #18 from jw3/16_17_fix

Issues 16 and 17 Fix

15 months agoCreate dropdown list for selecting/entering the version of the dapodil debugger to...
Shane Dell [Tue, 1 Jun 2021 21:38:09 +0000 (17:38 -0400)] 
Create dropdown list for selecting/entering the version of the dapodil debugger to download.

15 months agouseExistingServer flag (#13)
Shane Dell [Tue, 1 Jun 2021 14:31:14 +0000 (10:31 -0400)] 
useExistingServer flag (#13)

* Added a flag or specifing if the extension should run the debug server or not.

* got rid of bad input window

* rename runDebug to disableDapServer. Make sure that if disableDapServer is set to true the user will not be prompted for version to download

* remove disableDapServer from launch.json as I was just testing it

* update description of disableDapServer flag

* rename disableDAPServer to useExistingServer and update its description

* add ./ in front of file name to fix execution error on linux

16 months agoAdding a table to show which data formats work (#12)
James Mangus [Thu, 27 May 2021 17:48:02 +0000 (13:48 -0400)] 
Adding a table to show which data formats work (#12)

16 months agoGot the getDebugger method to be called everytime the debugger is launched. Since...
Shane Dell [Wed, 26 May 2021 17:57:17 +0000 (13:57 -0400)] 
Got the getDebugger method to be called everytime the debugger is launched. Since that now works I put the running of da-podil back into the extension and remove the tasks. So now there is no double prompt you can also use multiple version of the debugger easier now.

16 months agoMerge pull request #6 from jw3/fix/versionAndDownload
Shane Dell [Tue, 25 May 2021 22:20:51 +0000 (18:20 -0400)] 
Merge pull request #6 from jw3/fix/versionAndDownload

Version Input & Download Fix

16 months ago* Updated package.json in some places to replace daffodil to dfdl so that the downloa...
Shane Dell [Tue, 25 May 2021 22:13:24 +0000 (18:13 -0400)] 
* Updated package.json in some places to replace daffodil to dfdl so that the download would now work properly

* Update daffodil debugger version input. it allows for the user to enter either v0.0.1 or 0.0.1 and it will work.

16 months agochange some daffodil references to dfdl
John Wass [Tue, 25 May 2021 18:57:27 +0000 (14:57 -0400)] 
change some daffodil references to dfdl

16 months agoUpdated the debugger to ran via a task so that it will run everytime. The first time...
Shane Dell [Tue, 25 May 2021 16:19:47 +0000 (12:19 -0400)] 
Updated the debugger to ran via a task so that it will run everytime. The first time should download the version of the debugger desired then everytime after you will prompted for the debugger you have locally so that it can be ran.

16 months agosome readme updates
John Wass [Tue, 25 May 2021 18:21:31 +0000 (14:21 -0400)] 
some readme updates

16 months agorenamed all instances of mock to daffodil - keeping case (#4)
Shane Dell [Tue, 25 May 2021 17:53:03 +0000 (13:53 -0400)] 
renamed all instances of mock to daffodil - keeping case (#4)

Co-authored-by: Shane Dell <dells@ctc.com>
16 months agoDaffodil Packaging (#1)
Shane Dell [Tue, 25 May 2021 11:15:24 +0000 (07:15 -0400)] 
Daffodil Packaging (#1)

* Removed most things dealing with the web extension since we should not need it. Got the extension to be able check if the version of the debugger is avaiable locally, if it isn't it will download then runs the debugger pauses then the extension attaches to it.

* Updated debugger to work with windows

* Create shell script that creates the vsix file

* update icon and package strings

Co-authored-by: Shane Dell <dells@ctc.com>
Co-authored-by: John Wass <wassj@ctc.com>
16 months agopass schema and data through launch args
John Wass [Fri, 14 May 2021 19:22:38 +0000 (15:22 -0400)] 
pass schema and data through launch args

16 months agoadd test data
John Wass [Fri, 14 May 2021 19:21:12 +0000 (15:21 -0400)] 
add test data

16 months agoset port
John Wass [Wed, 12 May 2021 12:27:21 +0000 (08:27 -0400)] 
set port

16 months agomock debug should be default for markdown
isidor [Fri, 7 May 2021 11:50:14 +0000 (13:50 +0200)] 
mock debug should be default for markdown

17 months agomark as trusted
Andre Weinand [Wed, 14 Apr 2021 15:55:40 +0000 (17:55 +0200)] 
mark as trusted

17 months agoformat package.json
Andre Weinand [Wed, 7 Apr 2021 14:27:44 +0000 (16:27 +0200)] 
format package.json

17 months agoupdate dependencies
Andre Weinand [Tue, 6 Apr 2021 12:29:44 +0000 (14:29 +0200)] 
update dependencies

17 months agostop using proposed API
Andre Weinand [Tue, 6 Apr 2021 11:13:08 +0000 (13:13 +0200)] 
stop using proposed API

17 months agoadd another variable with same name
Andre Weinand [Tue, 23 Mar 2021 14:18:10 +0000 (15:18 +0100)] 
add another variable with same name

17 months agoMerge pull request #55 from microsoft/dependabot/npm_and_yarn/y18n-4.0.1
Andre Weinand [Tue, 6 Apr 2021 11:13:56 +0000 (13:13 +0200)] 
Merge pull request #55 from microsoft/dependabot/npm_and_yarn/y18n-4.0.1

Bump y18n from 4.0.0 to 4.0.1

17 months agoBump y18n from 4.0.0 to 4.0.1
dependabot[bot] [Tue, 30 Mar 2021 22:02:47 +0000 (22:02 +0000)] 
Bump y18n from 4.0.0 to 4.0.1

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
18 months agoMerge pull request #53 from microsoft/dependabot/npm_and_yarn/elliptic-6.5.4
Andre Weinand [Tue, 23 Mar 2021 11:43:59 +0000 (12:43 +0100)] 
Merge pull request #53 from microsoft/dependabot/npm_and_yarn/elliptic-6.5.4

Bump elliptic from 6.5.3 to 6.5.4

18 months agoMerge pull request #50 from Udith/master
Andre Weinand [Tue, 23 Mar 2021 11:42:57 +0000 (12:42 +0100)] 
Merge pull request #50 from Udith/master

Added "compile" as a pre launch task for "Server" run config

18 months agoadd another variable with identical name
Andre Weinand [Tue, 23 Mar 2021 08:34:14 +0000 (09:34 +0100)] 
add another variable with identical name

18 months agoBump elliptic from 6.5.3 to 6.5.4
dependabot[bot] [Fri, 19 Mar 2021 00:08:40 +0000 (00:08 +0000)] 
Bump elliptic from 6.5.3 to 6.5.4

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
18 months agobump version
Andre Weinand [Wed, 17 Mar 2021 22:52:34 +0000 (23:52 +0100)] 
bump version

18 months agomention data breakpoint access types in change log
Andre Weinand [Wed, 17 Mar 2021 22:51:30 +0000 (23:51 +0100)] 
mention data breakpoint access types in change log

18 months agoMerge pull request #52 from yannickowow/main
Andre Weinand [Wed, 17 Mar 2021 22:40:25 +0000 (23:40 +0100)] 
Merge pull request #52 from yannickowow/main

Modify test.md and mockDebug to test DataBreakpoint access types

18 months agoModify test.md and mockDebug to test DataBreakpoint access types
Yanis [Wed, 17 Mar 2021 22:34:50 +0000 (23:34 +0100)] 
Modify test.md and mockDebug to test DataBreakpoint access types

18 months agogroup run and debug commands in submenu
Andre Weinand [Mon, 1 Mar 2021 14:34:36 +0000 (15:34 +0100)] 
group run and debug commands in submenu

18 months agomore comments for inline value provider
Andre Weinand [Mon, 1 Mar 2021 12:08:41 +0000 (13:08 +0100)] 
more comments for inline value provider

19 months agouse final version of DAP 1.45
Andre Weinand [Thu, 25 Feb 2021 10:11:23 +0000 (11:11 +0100)] 
use final version of DAP 1.45

19 months agomatches variables in a case-insensitive way
Andre Weinand [Tue, 23 Feb 2021 22:20:42 +0000 (23:20 +0100)] 
matches variables in a case-insensitive way

19 months agoadd support for a custom inline value provider
Andre Weinand [Mon, 22 Feb 2021 21:28:45 +0000 (22:28 +0100)] 
add support for a custom inline value provider

19 months agoproperly activate on debug; fixes #117260
Andre Weinand [Mon, 22 Feb 2021 17:20:40 +0000 (18:20 +0100)] 
properly activate on debug; fixes #117260

19 months agoupdated ini version
Andre Weinand [Thu, 11 Feb 2021 10:28:39 +0000 (11:28 +0100)] 
updated ini version

19 months agoProvide help texts for exception filters via DAP's new `description` and `conditionDe...
Andre Weinand [Wed, 10 Feb 2021 19:14:54 +0000 (20:14 +0100)] 
Provide help texts for exception filters via DAP's new `description` and `conditionDescription`properties

19 months agofix folder casing
Andre Weinand [Fri, 29 Jan 2021 17:18:02 +0000 (18:18 +0100)] 
fix folder casing

20 months agoAdd support for the `exceptionInfo` request
Andre Weinand [Wed, 6 Jan 2021 16:42:56 +0000 (17:42 +0100)] 
Add support for the `exceptionInfo` request

20 months agorecommend required extensions; fixes microsoft/vscode-docs#4203
Andre Weinand [Tue, 5 Jan 2021 17:09:38 +0000 (18:09 +0100)] 
recommend required extensions; fixes microsoft/vscode-docs#4203

21 months agoAdded "compile" as a pre launch task for "Server" run config
Udith Gunaratna [Mon, 14 Dec 2020 05:09:59 +0000 (10:39 +0530)] 
Added "compile" as a pre launch task for "Server" run config

21 months agobump version
Andre Weinand [Thu, 3 Dec 2020 17:45:23 +0000 (18:45 +0100)] 
bump version

21 months agofix exception test
Andre Weinand [Thu, 3 Dec 2020 17:42:03 +0000 (18:42 +0100)] 
fix exception test

21 months agoupgrade DAP to 1.43
Andre Weinand [Thu, 3 Dec 2020 15:51:11 +0000 (16:51 +0100)] 
upgrade DAP to 1.43

21 months agoshow stack frame index only once
Andre Weinand [Thu, 3 Dec 2020 15:50:55 +0000 (16:50 +0100)] 
show stack frame index only once

21 months agobump version
Andre Weinand [Tue, 1 Dec 2020 15:05:07 +0000 (16:05 +0100)] 
bump version

21 months agofix for Windows; fixes microsoft/vscode#111600
Andre Weinand [Tue, 1 Dec 2020 15:02:42 +0000 (16:02 +0100)] 
fix for Windows; fixes microsoft/vscode#111600

21 months agoIntroduce two "real" exception options
Andre Weinand [Mon, 30 Nov 2020 21:07:37 +0000 (22:07 +0100)] 
Introduce two "real" exception options

22 months agoadd possible values for totalFrames
Andre Weinand [Thu, 26 Nov 2020 13:43:43 +0000 (14:43 +0100)] 
add possible values for totalFrames

22 months agoadd support for exception filter conditions
Andre Weinand [Tue, 24 Nov 2020 12:57:18 +0000 (13:57 +0100)] 
add support for exception filter conditions

22 months agodon't activate on "onDebug"
Andre Weinand [Tue, 10 Nov 2020 12:10:41 +0000 (13:10 +0100)] 
don't activate on "onDebug"

22 months agoMerge branch 'gjsjohnmurray-fix-#43'
Andre Weinand [Fri, 6 Nov 2020 15:11:18 +0000 (16:11 +0100)] 
Merge branch 'gjsjohnmurray-fix-#43'

22 months agomerge
Andre Weinand [Fri, 6 Nov 2020 15:09:49 +0000 (16:09 +0100)] 
merge