Skip to content

Commit 26f35c6

Browse files
committed
Improve changelog, lint default magics
1 parent 51b8bd4 commit 26f35c6

File tree

3 files changed

+32
-7
lines changed

3 files changed

+32
-7
lines changed

CHANGELOG.md

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,44 @@
11
## CHANGELOG
22

3-
### `@krassowski/jupyterlab-lsp 1.0.1` (unreleased)
3+
### `@krassowski/jupyterlab-lsp 1.1.0` (unreleased)
4+
5+
- features
6+
7+
- language servers can now be configured from the Advanced Settings Editor ([#245][])
48

59
- bug fixes
610

711
- fixes currently-highlighted token in dark editor themes against light lab theme
812
(and vice versa) ([#195][])
913
- restores sorting order-indicating caret icons in diagnostics panel table ([#261][])
1014
- handles document open and change operation ordering more predictably ([#284][])
11-
- fixes some pyflakes issues caused by line magics substitution
15+
- fixes some pyflakes issues caused by line magics substitution ([#293][])
1216

1317
[#195]: https://github.com/krassowski/jupyterlab-lsp/issues/195
1418
[#261]: https://github.com/krassowski/jupyterlab-lsp/issues/261
19+
[#293]: https://github.com/krassowski/jupyterlab-lsp/pull/293
20+
21+
### `@krassowski/jupyterlab-lsp 0.9.0` (unreleased)
22+
23+
- features
24+
25+
- language servers can now be configured from the Advanced Settings Editor ([#245][])
26+
27+
- bug fixes
28+
29+
- handles document open and change operation ordering more predictably ([#284][])
30+
31+
### `lsp-ws-connection 0.5.0` (unreleased)
32+
33+
- features
34+
35+
- language servers can now be configured from the Advanced Settings Editor ([#245][])
36+
37+
- bug fixes
38+
39+
- handles document open and change operation ordering more predictably ([#284][])
40+
41+
[#245]: https://github.com/krassowski/jupyterlab-lsp/pull/245
1542
[#284]: https://github.com/krassowski/jupyterlab-lsp/pull/284
1643

1744
### `@krassowski/jupyterlab-lsp 1.0.0` (2020-03-14)

packages/jupyterlab-lsp/src/magics/defaults.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,7 @@ describe('Default IPython overrides', () => {
108108
// this is a corner-case as described in
109109
// https://github.com/krassowski/jupyterlab-lsp/issues/281#issuecomment-645286076
110110
let override = line_magics_map.override_for('x =%ls');
111-
expect(override).to.equal(
112-
'x =get_ipython().run_line_magic("ls", "")'
113-
);
111+
expect(override).to.equal('x =get_ipython().run_line_magic("ls", "")');
114112
});
115113

116114
it('does not override line-magic-like constructs', () => {

packages/jupyterlab-lsp/src/magics/defaults.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ export const language_specific_overrides: IOverridesRegistry = {
3939

4040
// note magics do not have to start with the new line, for example x = !ls or x = %ls are both valid.
4141
// x =%ls is also valid. However, percent may also appear in strings, e.g. ls('%').
42-
// Hence: (^|\s|=) for shell commands (!) and line magics (%); see issue #281.
42+
// Hence: (^|\\s|=) for shell commands (!) and line magics (%); see issue #281.
4343
// This does not solve all issues, for example `list(" %ls")` still leads to:
4444
// `list(" get_ipython().run_line_magic("ls")", "")`.
4545
{
46-
pattern: '(^|\s|=)!(\\S+)(.*)(\n)?',
46+
pattern: '(^|\\s|=)!(\\S+)(.*)(\n)?',
4747
replacement: '$1get_ipython().getoutput("$2$3")$4',
4848
reverse: {
4949
pattern: 'get_ipython\\(\\).getoutput\\("(.*?)"\\)(\n)?',

0 commit comments

Comments
 (0)