Skip to content

fix highlight collapse in default themes #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uchijo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix highlight collapse in default themes #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/codeHighlighter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import json5 from 'json5';
import * as shiki from 'shiki';
import type { IShikiTheme, Theme } from 'shiki';
import type { IShikiTheme } from 'shiki';
import { Highlighter } from 'shiki';
import * as vscode from 'vscode';

declare const TextDecoder: any;

// Default themes use `include` option that shiki doesn't support
const defaultThemesMap = new Map<string, Theme>([
['Default Light+', 'light-plus'],
['Default Dark+', 'dark-plus'],
]);

function getCurrentThemePath(themeName: string): vscode.Uri | undefined {
for (const ext of vscode.extensions.all) {
const themes = ext.packageJSON.contributes && ext.packageJSON.contributes.themes;
Expand Down Expand Up @@ -87,9 +81,7 @@ export class CodeHighlighter {
let theme: string | IShikiTheme | undefined;

const currentThemeName = vscode.workspace.getConfiguration('workbench').get<string>('colorTheme');
if (currentThemeName && defaultThemesMap.has(currentThemeName)) {
theme = defaultThemesMap.get(currentThemeName);
} else if (currentThemeName) {
if (currentThemeName) {
const colorThemePath = getCurrentThemePath(currentThemeName);
if (colorThemePath) {
theme = await shiki.loadTheme(colorThemePath.fsPath);
Expand Down