From a7bde293f47e9ded03a4509439a0d431984ecc5b Mon Sep 17 00:00:00 2001 From: Moros Smith Date: Fri, 6 Sep 2024 14:03:17 -0400 Subject: [PATCH 1/3] add the model service override to fascilitate the text models --- resources/js/lib/monacoConfig.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/js/lib/monacoConfig.js b/resources/js/lib/monacoConfig.js index f14a73b..6541f71 100644 --- a/resources/js/lib/monacoConfig.js +++ b/resources/js/lib/monacoConfig.js @@ -5,7 +5,8 @@ import * as vscode from 'vscode'; import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-override'; -import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override' +import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override'; +import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override'; import monacoVscodeTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override'; import { useOpenEditorStub } from 'monaco-editor-wrapper/vscode/services'; import { getStorageValue, setStorageValue } from './storage'; @@ -88,6 +89,7 @@ export const createUserConfig = (workspaceRoot, code, codeUri) => serviceConfig: { userServices: { ...getEditorServiceOverride(useOpenEditorStub), + ...getModelServiceOverride(), ...monacoVscodeTextmateServiceOverride(), ...getKeybindingsServiceOverride(), }, From f5c860a561e323c1bb76e7ca08a66f9f53331410 Mon Sep 17 00:00:00 2001 From: Moros Smith Date: Fri, 6 Sep 2024 14:03:42 -0400 Subject: [PATCH 2/3] fix the input.rename-input dark on dark coloring problem --- resources/css/app/components/EditorPanel.scss | 4 ++++ resources/js/lib/monacoConfig.js | 2 ++ 2 files changed, 6 insertions(+) diff --git a/resources/css/app/components/EditorPanel.scss b/resources/css/app/components/EditorPanel.scss index 1735052..4561042 100644 --- a/resources/css/app/components/EditorPanel.scss +++ b/resources/css/app/components/EditorPanel.scss @@ -11,6 +11,10 @@ right: 0; bottom: 1.2rem; } + + input.rename-input { + color: var(--vscode-foreground); + } .status { position: absolute; diff --git a/resources/js/lib/monacoConfig.js b/resources/js/lib/monacoConfig.js index 6541f71..ed5e84d 100644 --- a/resources/js/lib/monacoConfig.js +++ b/resources/js/lib/monacoConfig.js @@ -7,6 +7,7 @@ import * as vscode from 'vscode'; import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-override'; import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override'; import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override'; +import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override'; import monacoVscodeTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override'; import { useOpenEditorStub } from 'monaco-editor-wrapper/vscode/services'; import { getStorageValue, setStorageValue } from './storage'; @@ -90,6 +91,7 @@ export const createUserConfig = (workspaceRoot, code, codeUri) => userServices: { ...getEditorServiceOverride(useOpenEditorStub), ...getModelServiceOverride(), + ...getThemeServiceOverride(), ...monacoVscodeTextmateServiceOverride(), ...getKeybindingsServiceOverride(), }, From 18b8d6331112d510a4cb026162e3516fcbcdad7d Mon Sep 17 00:00:00 2001 From: Moros Smith Date: Fri, 6 Sep 2024 14:05:06 -0400 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5ef185..ee66138 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. Each batch It is a summary of changes that would be pertinent to the end user of the PGEtinker website. For a comprehensive history of changes made to the project, please refer to the repository's commit history. +## 2024-09-06 + +- Fixed [Issue #122](https://github.com/Moros1138/PGEtinker/issues/122) + ## 2024-07-12 - Fixed [Issue #120](https://github.com/Moros1138/PGEtinker/issues/120)