0.7.2

assets/locale/en.json

@@ -5,7 +5,7 @@
         "--------------------------------------------------------------------------------------------",
         "Do not edit this file. It is machine generated."
     ],
-    "version": "0.7.1",
+    "version": "0.7.2",
     "contents": {
         "editor/common/markdown": {
             "code": "Code",

assets/locale/zh-cn.json

@@ -5,7 +5,7 @@
         "--------------------------------------------------------------------------------------------",
         "Do not edit this file. It is machine generated."
     ],
-    "version": "0.7.1",
+    "version": "0.7.2",
     "contents": {
         "platform/i18n/browser/i18nService": {
             "relaunchDisplayLanguageMessage": "重新启动 {name} 以切换到语言：{languageName}?"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nota",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "A cross-platform markdown note-taking app.",
 	"main": "./dist/main-bundle.js",
 	"type": "commonjs",

product.json

@@ -8,6 +8,6 @@
     "projectName": "nota",
     "applicationName": "nota",
     "description": "A cross-platform markdown note-taking app.",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "license": "MIT"
 }

src/base/common/keyboard.ts

@@ -534,14 +534,17 @@ export class Shortcut {
             } else if (lowerPart === 'meta' || lowerPart === 'cmd') {
                 shortcut.meta = true;
             } else {
+                // duplicate main key found, we consider it as invalid shortcut.
                 if (shortcut.key !== KeyCode.None) {
+                    console.warn(`Invalid shortcut string (${string})`);
                     return Shortcut.None;
                 }
 
                 const key = Keyboard.toKeyCode(part);
                 if (key !== KeyCode.None) {
                     shortcut.key = key;
                 } else {
+                    console.warn(`Invalid shortcut string (${string})`);
                     return Shortcut.None;
                 }
             }

src/base/common/utilities/type.ts

@@ -280,6 +280,11 @@ export type Push<Arr extends any[], V> = [...Arr, V];
  */
 export type Pop<Arr extends any[]> = Arr extends [...infer Rest, any] ? Rest : never;
 
+/**
+ * Remove the first of the array (require non empty).
+ */
+export type Shift<Arr extends any[]> = Arr extends [any, ...infer Rest] ? Rest : never;
+
 /**
  * Converts a two-dimensional array type to a one-dimensional array type.
  */

src/code/browser/renderer.desktop.ts

@@ -71,6 +71,9 @@ import { INotificationService } from "src/workbench/services/notification/notifi
 import { IEncryptionService } from "src/platform/encryption/common/encryptionService";
 import { BrowserAITextChannel } from "src/platform/ai/common/aiTextChannel";
 import { IAITextService } from "src/platform/ai/common/aiText";
+import { IEditorService } from "src/workbench/services/editor/editor";
+import { EditorService } from "src/workbench/services/editor/editorService";
+import { rendererEditorCommandRegister } from "src/editor/contrib/command/command.register";
 
 /**
  * @class This is the main entry of the renderer process.
@@ -148,6 +151,10 @@ const renderer = new class extends class RendererInstance extends Disposable {
         const contextService = new ContextService();
         instantiationService.store(IContextService, contextService);
 
+        // editor-service
+        const editorService = new EditorService();
+        instantiationService.store(IEditorService, editorService);
+
         // registrant-service
         const registrantService = instantiationService.createInstance(RegistrantService);
         instantiationService.store(IRegistrantService, registrantService);
@@ -321,6 +328,7 @@ const renderer = new class extends class RendererInstance extends Disposable {
                 [
                     rendererWorkbenchCommandRegister,
                     rendererTitleBarFileCommandRegister,
+                    rendererEditorCommandRegister,
                 ]
                 .forEach(register => register(provider));
             }

src/editor/common/editorContextKeys.ts

@@ -4,8 +4,13 @@ import { CreateContextKeyExpr } from "src/platform/context/common/contextKeyExpr
 
 export namespace EditorContextKeys {
     export const editorFocusedContext = CreateContextKeyExpr.Equal('isEditorFocused', true);
-    export const isEditorReadonly = CreateContextKeyExpr.Equal('isEditorReadonly', true);
     export const isEditorWritable = CreateContextKeyExpr.Equal('isEditorWritable', true);
+    export const isEditorEditable = CreateContextKeyExpr.And(editorFocusedContext, isEditorWritable);
+    export const isEditorReadonly = CreateContextKeyExpr.Or(
+        CreateContextKeyExpr.Equal('isEditorReadonly', true),
+        isEditorWritable,
+    );
+    export const isEditorNotEditable = CreateContextKeyExpr.And(editorFocusedContext, isEditorReadonly);
     export const richtextEditorMode = CreateContextKeyExpr.Equal('editorRenderMode', EditorType.Rich);
     export const plaintextEditorMode = CreateContextKeyExpr.Equal('editorRenderMode', EditorType.Plain);
     export const splitViewEditorMode = CreateContextKeyExpr.Equal('editorRenderMode', EditorType.Split);

src/editor/common/proseMirror.ts

@@ -4,6 +4,7 @@ import { Selection } from "prosemirror-state";
 export {
     Step as ProseStep,
     ReplaceStep as ProseReplaceStep,
+    ReplaceAroundStep as ProseReplaceAroundStep,
     Mapping as ProseMapping,
     StepMap as ProseStepMapping,
 } from "prosemirror-transform";

src/editor/contrib/builtInExtensionList.ts

@@ -1,6 +1,5 @@
 import { Constructor } from "src/base/common/utilities/type";
 import { EditorExtension } from "src/editor/common/editorExtension";
-import { EditorCommandExtension } from "src/editor/contrib/command/command";
 import { EditorAutoSaveExtension } from "src/editor/contrib/autoSave";
 import { EditorSnippetExtension } from "src/editor/contrib/snippet/snippet";
 import { EditorDragAndDropExtension } from "src/editor/contrib/dragAndDrop/dragAndDrop";
@@ -11,7 +10,6 @@ import { EditorAskAIExtension } from "src/editor/contrib/askAI/askAI";
 // import { EditorHistoryExtension } from "src/editor/contrib/history/history";
 
 export const enum EditorExtensionIDs {
-    Command   = 'editor-command-extension',
     AutoSave  = 'editor-autosave-extension',
     Snippet = 'editor-snippet-extension',
     History   = 'editor-history-extension',
@@ -29,7 +27,6 @@ export function getBuiltInExtension(): { id: string, ctor: Constructor<EditorExt
     return [
         { id: EditorExtensionIDs.Snippet, ctor: EditorSnippetExtension },
         { id: EditorExtensionIDs.AutoSave, ctor: EditorAutoSaveExtension },
-        { id: EditorExtensionIDs.Command, ctor: EditorCommandExtension },
         { id: EditorExtensionIDs.DragAndDrop, ctor: EditorDragAndDropExtension },
         { id: EditorExtensionIDs.BlockHandle, ctor: EditorBlockHandleExtension },
         { id: EditorExtensionIDs.BlockPlaceHolder, ctor: EditorBlockPlaceHolderExtension },