fix: merge conflicts; accumulate changes in interfaces

Author: mkslanc

Makefile.dryice.js

@@ -182,13 +182,6 @@ function ace() {
 function correctDeclarationsForBuild(path) {
     var definitions = fs.readFileSync(path, 'utf8');
     var newDefinitions = updateDeclarationModuleNames(definitions);
-    if (additionalDeclarations) {
-        newDefinitions = newDefinitions + '\n' + additionalDeclarations;
-    }
-    if (/ace\.d\.ts$/.test(path)) {
-        var aceRequire = "$1\n    export function require(name: string): any;";
-        newDefinitions = newDefinitions.replace(/(declare\smodule\s"ace\-builds"\s{)/, aceRequire);
-    }
     fs.writeFileSync(path, newDefinitions, "utf-8");
 }
 
@@ -212,11 +205,12 @@ function buildTypes() {
             return "declare module 'ace-builds/src-noconflict/" + moduleName + "';";
         }
     }).filter(Boolean)).join("\n") + "\n";
-    
+
     generateDeclaration();
     fs.copyFileSync(ACE_HOME + '/ace-modes.d.ts', BUILD_DIR + '/ace-modes.d.ts');
     correctDeclarationsForBuild(BUILD_DIR + '/ace-modes.d.ts');
-    const finalDeclaration = bundleDtsFiles() + "\n" + pathModules;
+    let finalDeclaration = bundleDtsFiles() + "\n" + pathModules;
+    finalDeclaration = finalDeclaration.replace(/(declare\smodule\s"ace\-builds"\s{)/, "$1\n    export function require(name: string): any;");
 
     var esmUrls = [];
 

ace-internal.d.ts

@@ -40,6 +40,8 @@ export namespace Ace {
     type DragdropHandler = import("./src/mouse/dragdrop_handler").DragdropHandler;
     type AppConfig = import("./src/lib/app_config").AppConfig;
     type Config = typeof import("./src/config");
+    type GutterTooltip = import( "./src/mouse/default_gutter_handler").GutterTooltip;
+    type GutterKeyboardEvent = import( "./src/keyboard/gutter_handler").GutterKeyboardEvent;
 
     type AfterLoadCallback = import("./interfaces").AfterLoadCallback
     type LoaderFunction = import("./interfaces").LoaderFunction;
@@ -225,6 +227,11 @@ export namespace Ace {
 
     type StaticHighlightOptions = import("./interfaces").StaticHighlightOptions;
     type Operation = import("./interfaces").Operation;
+
+    type CommandBarEvents = import("./interfaces").CommandBarEvents;
+    type FontMetricsEvents = import("./interfaces").FontMetricsEvents;
+    type OptionPanelEvents = import("./interfaces").OptionPanelEvents;
+    type ScrollbarEvents = import("./interfaces").ScrollbarEvents;
 }
 
 declare global {
@@ -290,6 +297,7 @@ declare module "./src/editor" {
         showSettingsMenu?: () => void,
         searchBox?: SearchBox,
         _eventRegistry?: any,
+        $textInputAriaLabel?: string
     }
 }
 
@@ -348,18 +356,18 @@ declare module "./src/placeholder" {
 }
 
 declare module "./src/scrollbar" {
-    export interface VScrollBar extends i.EventEmitter<any> {
+    export interface VScrollBar extends i.EventEmitter<i.ScrollbarEvents> {
     }
 
-    export interface HScrollBar extends i.EventEmitter<any> {
+    export interface HScrollBar extends i.EventEmitter<i.ScrollbarEvents> {
     }
 }
 
 declare module "./src/scrollbar_custom" {
-    export interface VScrollBar extends i.EventEmitter<any> {
+    export interface VScrollBar extends i.EventEmitter<i.ScrollbarEvents> {
     }
 
-    export interface HScrollBar extends i.EventEmitter<any> {
+    export interface HScrollBar extends i.EventEmitter<i.ScrollbarEvents> {
     }
 }
 
@@ -420,13 +428,13 @@ declare module "./src/snippets" {
 }
 
 declare module "./src/ext/command_bar" {
-    export interface CommandBarTooltip extends i.EventEmitter<any> {
+    export interface CommandBarTooltip extends i.EventEmitter<i.CommandBarEvents> {
         $shouldHideMoreOptions?: boolean,
     }
 }
 
 declare module "./src/commands/command_manager" {
-    export interface CommandManager extends i.EventEmitter<any> {
+    export interface CommandManager extends i.EventEmitter<i.CommandManagerEvents> {
         $checkCommandState?: boolean
     }
 }
@@ -505,12 +513,12 @@ declare module "./src/mouse/mouse_handler" {
 }
 
 declare module "./src/ext/options" {
-    export interface OptionPanel extends i.EventEmitter<any> {
+    export interface OptionPanel extends i.EventEmitter<i.OptionPanelEvents> {
     }
 }
 
 declare module "./src/layer/font_metrics" {
-    export interface FontMetrics extends i.EventEmitter<any> {
+    export interface FontMetrics extends i.EventEmitter<i.FontMetricsEvents> {
     }
 }
 

interfaces.d.ts

@@ -14,6 +14,8 @@ import type {ElasticTabstopsLite} from "./src/ext/elastic_tabstops_lite";
 import type {MouseEvent} from "./src/mouse/mouse_event";
 export type AfterLoadCallback = (err: Error | null, module: unknown) => void;
 export type LoaderFunction = (moduleName: string, afterLoad: AfterLoadCallback) => void;
+import type {GutterKeyboardEvent} from "./src/keyboard/gutter_handler";
+import type {GutterTooltip} from "./src/mouse/default_gutter_handler";
 
 export interface ConfigOptions {
     packaged: boolean,
@@ -493,7 +495,7 @@ export interface EditorEvents {
     /**
      * Emitted when text is pasted.
      **/
-    "paste": (text: string, event: any) => void;
+    "paste": (e: { text: string, event?: ClipboardEvent }) => void;
     /**
      * Emitted when the selection style changes, via [[Editor.setSelectionStyle]].
      * @param data Contains one property, `data`, which indicates the new selection style
@@ -508,6 +510,11 @@ export interface EditorEvents {
     "codeLensClick": (e: any) => void;
 
     "select": () => void;
+    "gutterkeydown": (e: GutterKeyboardEvent) => void;
+    "gutterclick": (e: MouseEvent) => void;
+    "showGutterTooltip": (e: GutterTooltip) => void;
+    "hideGutterTooltip": (e: GutterTooltip) => void;
+    "compositionStart": () => void;
 }
 
 export interface AcePopupEvents {
@@ -913,9 +920,9 @@ export type execEventHandler = (obj: {
 }) => void;
 
 export interface CommandManagerEvents {
-    on(name: 'exec', callback: execEventHandler): Function;
-
-    on(name: 'afterExec', callback: execEventHandler): Function;
+    "exec": execEventHandler
+    "afterExec": execEventHandler;
+    "commandUnavailable": execEventHandler;
 }
 
 export interface SavedSelection {
@@ -1197,4 +1204,22 @@ export interface Operation {
     selectionAfter?: Range | Range[];
     docChanged?: boolean;
     selectionChanged?: boolean;
+}
+
+export interface CommandBarEvents {
+    "hide": () => void;
+    "show": () => void;
+    "alwaysShow": (e: boolean) => void;
+}
+
+export interface FontMetricsEvents {
+    "changeCharacterSize": (e: { data: { height: number, width: number } }) => void;
+}
+
+export interface OptionPanelEvents {
+    "setOption": (e: { name: string, value: any }) => void;
+}
+
+export interface ScrollbarEvents {
+    "scroll": (e: { data: number }) => void;
 }