From a5013315ea6808c3516251e2dfef39621468c580 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 31 Jan 2022 14:45:49 +0000 Subject: [PATCH 1/3] chore(release): 2.2.2 [skip ci] --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19c8ec9..5adce82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.2.2](https://github.com/pycom/pymakr-atom/compare/v2.2.1...v2.2.2) (2022-01-31) + + +### Bug Fixes + +* removed deprecated "synchronize project" ([7df8f8a](https://github.com/pycom/pymakr-atom/commit/7df8f8a4f61d1b756170bbf25d5b3a7d6142412d)) + ## [2.2.1](https://github.com/pycom/pymakr-atom/compare/v2.2.0...v2.2.1) (2022-01-13) diff --git a/package-lock.json b/package-lock.json index f8a308f..4d01896 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pymakr", - "version": "2.2.1", + "version": "2.2.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pymakr", - "version": "2.2.1", + "version": "2.2.2", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 00b43d0..4abc9d7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pymakr", "main": "./lib/main.js", - "version": "2.2.1", + "version": "2.2.2", "description": "Adds a REPL console to Atom that connects to your Pycom board. It can run code on the board or synchronize your project files to it.", "keywords": [ "Pycom", From f8cdbd55d8bc9280935a46180d7223422eaa92c3 Mon Sep 17 00:00:00 2001 From: Jakob Rosenberg Date: Mon, 21 Feb 2022 09:47:47 +0100 Subject: [PATCH 2/3] feat: make max scrollback configurable --- lib/config.js | 7 +++++++ lib/views/terminal.js | 2 +- lib/wrappers/settings-wrapper.js | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/config.js b/lib/config.js index 7d9f0e9..885a534 100644 --- a/lib/config.js +++ b/lib/config.js @@ -217,6 +217,13 @@ export default class Config { "Changes the terminal font size.", order: 14, }, + scrollback: { + type: "number", + default: 5000, + title: "Scrollback", + description: "The max number lines to preserve in the terminal.", + order: 15 + }, }; } } diff --git a/lib/views/terminal.js b/lib/views/terminal.js index 5f82a10..89a06ca 100644 --- a/lib/views/terminal.js +++ b/lib/views/terminal.js @@ -30,7 +30,7 @@ export default class Term { rows: this.term_rows.default, cols: 120, rendererType: 'dom', - scrollback: 5000, + scrollback: this.api.config('scrollback') }); this.xterm.loadAddon(this.fit); // for copy-paste with cmd key diff --git a/lib/wrappers/settings-wrapper.js b/lib/wrappers/settings-wrapper.js index be67e87..74e9b9e 100644 --- a/lib/wrappers/settings-wrapper.js +++ b/lib/wrappers/settings-wrapper.js @@ -126,6 +126,7 @@ export default class SettingsWrapper extends EventEmitter { this.auto_connect = this.api.config('auto_connect'); this.py_ignore = this.api.config('py_ignore'); this.fast_upload = this.api.config('fast_upload'); + this.scrollback = this.api.config('scrollback'); this.autoconnect_comport_manufacturers = this.api.config( 'autoconnect_comport_manufacturers', ); @@ -242,6 +243,9 @@ export default class SettingsWrapper extends EventEmitter { if ('font_size' in this.project_config) { this.font_size = this.project_config.font_size; } + if('scrollback' in this.project_config) { + this.scrollback = this.project_config.scrollback + } } getDefaultProjectConfig() { @@ -258,6 +262,7 @@ export default class SettingsWrapper extends EventEmitter { py_ignore: this.api.config('py_ignore'), fast_upload: this.api.config('fast_upload'), font_size: this.api.config('font_size'), + scrollback: this.api.config('scrollback'), }; return config; } From e03711a22a82a65614f0962fcde1437c24ea4c16 Mon Sep 17 00:00:00 2001 From: Jakob Rosenberg Date: Mon, 21 Feb 2022 09:56:28 +0100 Subject: [PATCH 3/3] chore: fix typo --- lib/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/config.js b/lib/config.js index 885a534..04df193 100644 --- a/lib/config.js +++ b/lib/config.js @@ -221,7 +221,7 @@ export default class Config { type: "number", default: 5000, title: "Scrollback", - description: "The max number lines to preserve in the terminal.", + description: "The max number of lines to preserve in the terminal.", order: 15 }, };