feats::

统一语言配置位置
支持langs继承
支持归类

packages/ui-default/components/scratchpad/ScratchpadEditorContainer.jsx

@@ -4,7 +4,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
 const mapStateToProps = (state) => ({
   value: state.editor.code,
-  language: window.MONACO_MODES[state.editor.lang],
+  language: window.LANGS[state.editor.lang].monaco,
   theme: 'vs-light',
   mainSize: state.ui.main.size,
   pretestSize: state.ui.pretest.size,

packages/ui-default/components/scratchpad/ScratchpadToolbarContainer.jsx

@@ -136,8 +136,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(class ScratchpadTool
             value={this.props.editorLang}
             onChange={(ev) => this.props.setEditorLanguage(ev.target.value)}
           >
-            {_.map(window.LANG_TEXTS, (val, key) => (
-              <option value={key} key={key}>{val}</option>
+            {_.map(window.LANGS, (val, key) => (
+              <option value={key} key={key}>{val.display}</option>
             ))}
           </select>
         </ToolbarItem>

packages/ui-default/handler.js

@@ -53,15 +53,7 @@ class UiConstantsHandler extends Handler {
   }
 
   async get() {
-    const [LANG_TEXTS, LANG_HIGHLIGHT_ID, MONACO_MODES] = system.getMany([
-      'lang.texts',
-      'ui-default.lang_highlight_id',
-      'ui-default.lang_monaco_modes',
-    ]);
-    this.response.body = `\
-window.LANG_TEXTS=${JSON.stringify(yaml.load(LANG_TEXTS))};
-window.LANG_HIGHLIGHT_ID=${JSON.stringify(yaml.load(LANG_HIGHLIGHT_ID))};
-window.MONACO_MODES=${JSON.stringify(yaml.load(MONACO_MODES))}`;
+    this.response.body = `window.LANGS=${JSON.stringify(system.langs)}`;
     this.response.type = 'text/javascript';
     this.ctx.set('nolog', '1');
   }

packages/ui-default/locales/zh.yaml

@@ -433,7 +433,6 @@ Memory: 内存
 Message {0} not found.: 消息 {0} 不存在。
 Messages: 消息
 Method: 方法
-Monaco language modes: 编译语言代号 -> Monaco 编辑器模式
 Month: 月
 Monthly Popular: 月度最受欢迎
 Most Upvoted Solutions: 最被赞同的题解

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.7.8",
+  "version": "4.8.0",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
@@ -22,7 +22,7 @@
     "@babel/preset-react": "^7.13.13",
     "@babel/register": "^7.13.14",
     "@babel/runtime-corejs2": "^7.14.0",
-    "@hydrooj/utils": "^1.0.13",
+    "@hydrooj/utils": "^1.0.14",
     "ansi_up": "^5.0.1",
     "autoprefixer": "^9.8.6",
     "babel-loader": "^8.2.2",

packages/ui-default/setting.yaml

@@ -43,44 +43,6 @@ nav_logo_dark_2x:
   name: nav_logo_dark_2x
   desc: Nav Logo Dark@2x
   default: /components/navigation/nav-logo-small@2x_dark.png
-lang_highlight_id:
-  type: yaml
-  name: lang_highlight_id
-  desc: Language Highlight ID
-  default:
-    c: c astyle-c
-    cc: cpp astyle-c
-    cs: csharp astyle-cs
-    pas: pascal
-    java: java astyle-java
-    py: python
-    py3: python
-    php: php
-    rs: rust
-    hs: haskell
-    js: javascript
-    go: go
-    rb: ruby
-    jl: julia
-lang_monaco_modes:
-  type: yaml
-  name: lang_monaco_modes
-  desc: Monaco language modes
-  default:
-    c: cpp
-    cc: cpp
-    cs: csharp
-    pas: pascal
-    java: java
-    py: python
-    py3: python
-    php: php
-    rs: rust
-    hs: haskell
-    js: javascript
-    go: go
-    rb: ruby
-    jl: julia
 preferredEditorType:
   type:
     wysiwyg: WYSIWYG

packages/ui-default/templates/record_detail.html

@@ -11,7 +11,7 @@
         <h1 class="section__title">{{ _('Code') }}</h1>
       </div>
       <div class="section__body">
-        <pre><code class="line-numbers language-{{ (model.system.get('ui-default.lang_highlight_id')|parseYaml)[rdoc['lang']] }}">{{ rdoc['code'] }}</code></pre>
+        <pre><code class="line-numbers language-{{ model.system.langs[rdoc.lang].highlight }}">{{ rdoc['code'] }}</code></pre>
       </div>
     </div>
     {% endif %}