Skip to content

Commit

Permalink
Merge branch 'vite' of github.com:microbit-foundation/python-editor-v…
Browse files Browse the repository at this point in the history
…3 into vite
  • Loading branch information
microbit-matt-hillsdon committed Mar 14, 2024
2 parents 9dc4ea0 + 2ec757a commit f1cc2e4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/documentation/search/search-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const workerForLanguage = (language: string) => {
// See also convertLangToLunrParam

// Enumerated for code splitting as Vite doesn't support dynamic strings here
// We use a worker per language for because Vite doesn't support using dynamic
// We use a worker per language because Vite doesn't support using dynamic
// import in a iife Worker and Safari doesn't support module workers.
switch (language.toLowerCase()) {
case "de": {
Expand Down
2 changes: 1 addition & 1 deletion src/fs/host-default.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { defaultInitialProject } from "./initial-project";
import { testMigrationUrl } from "./migration-test-data";

describe("DefaultHost", () => {
it.skip("uses migration if available", async () => {
it("uses migration if available", async () => {
const project = await new DefaultHost(
testMigrationUrl
).createInitialProject();
Expand Down
2 changes: 1 addition & 1 deletion src/fs/migration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { isMigration, parseMigrationFromUrl } from "./migration";
import { testMigrationUrl } from "./migration-test-data";

describe.skip("parseMigrationFromUrl", () => {
describe("parseMigrationFromUrl", () => {
it("parses valid URL", () => {
const migration = parseMigrationFromUrl(testMigrationUrl);
expect(migration).toEqual({
Expand Down
2 changes: 1 addition & 1 deletion src/language-server/pyright.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const pyright = async (
return undefined;
}
if (cache) {
// This is safe to called if already initialized.
// This is safe to call if already initialized.
await cache.client.initialize();
if (cache.language === language) {
return cache.client;
Expand Down

0 comments on commit f1cc2e4

Please sign in to comment.