Skip to content

Commit 2c4d721

Browse files
Merge branch 'main' into languagesSidebar
2 parents fe2aefe + 4619cbc commit 2c4d721

File tree

7 files changed

+36
-587
lines changed

7 files changed

+36
-587
lines changed

CHANGELOG.md

Lines changed: 2 additions & 584 deletions
Large diffs are not rendered by default.

changelog/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Change log entries
2+
3+
This directory contains the raw changelog entries that we will one day use to generate proper release notes. Until then, you can read them here, imagining them in their beautiful future form.

packages/cursorless-engine/src/actions/snippetsLegacy/InsertSnippetLegacy.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
findMatchingSnippetDefinitionStrict,
2222
transformSnippetVariables,
2323
} from "../snippetsLegacy/snippet";
24+
import { showLegacySnippetsNotification } from "./legacySnippetsNotification";
2425
import { textFormatters, type TextFormatterName } from "./textFormatters";
2526

2627
export default class InsertSnippetLegacy {
@@ -95,6 +96,8 @@ export default class InsertSnippetLegacy {
9596
destinations: Destination[],
9697
snippetDescription: NamedInsertSnippetArg,
9798
): Promise<ActionReturnValue> {
99+
showLegacySnippetsNotification();
100+
98101
const editor = ide().getEditableTextEditor(
99102
ensureSingleEditor(destinations),
100103
);

packages/cursorless-engine/src/actions/snippetsLegacy/WrapWithSnippetLegacy.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
findMatchingSnippetDefinitionStrict,
1515
transformSnippetVariables,
1616
} from "../snippetsLegacy/snippet";
17+
import { showLegacySnippetsNotification } from "./legacySnippetsNotification";
1718

1819
export default class WrapWithSnippetLegacy {
1920
private snippetParser = new SnippetParser();
@@ -81,6 +82,8 @@ export default class WrapWithSnippetLegacy {
8182
targets: Target[],
8283
snippetDescription: NamedWrapWithSnippetArg,
8384
): Promise<ActionReturnValue> {
85+
showLegacySnippetsNotification();
86+
8487
const editor = ide().getEditableTextEditor(ensureSingleEditor(targets));
8588

8689
const body = this.getBody(snippetDescription, targets);
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { showWarning } from "@cursorless/common";
2+
import { ide } from "../../singletons/ide.singleton";
3+
4+
// Show only once per vscode instance
5+
let wasShown = false;
6+
7+
export function showLegacySnippetsNotification() {
8+
if (wasShown) {
9+
return;
10+
}
11+
12+
void showWarning(
13+
ide().messages,
14+
"legacySnippets",
15+
"Talon community snippets are now fully supported in Cursorless! Cursorless's experimental snippets are now deprecated, but in most cases we can help you migrate automatically. Update cursorless-talon and say 'cursorless migrate snippets'.",
16+
);
17+
18+
wasShown = true;
19+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Release notes
22

33
Here we gather "release notes" with new Cursorless features, bug fixes, and improvements. Note that Cursorless is on continuous delivery, so these "releases" are just a way to highlight features that you already have, but might not have noticed 😊.
4+
5+
Note that these release notes come out very occasionally, so if you want to know what we've been up to between releases, you can check out our raw changelog entries, which are stored in [markdown blurbs in our monorepo](https://github.com/cursorless-dev/cursorless/tree/main/changelog). In the future, we'll generate proper release notes from these blurbs. Until then, you'll have to use your imagination or wait for us to hand-write release notes.

packages/test-harness/src/runAllTests.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,11 @@ async function runTestsInDir(
7777
const failedTests: string[] = [];
7878

7979
const runner = mocha.run((failures) => {
80+
if (shouldLogFailedTests()) {
81+
logFailedTests(failedTests);
82+
}
83+
8084
if (failures > 0) {
81-
if (shouldLogFailedTests()) {
82-
logFailedTests(failedTests);
83-
}
8485
reject(`${failures} tests failed.`);
8586
} else {
8687
resolve();

0 commit comments

Comments
 (0)