Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/pkg/
/target/
/.idea/

Cargo.lock
.idea/
2 changes: 1 addition & 1 deletion build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"build-debug": "rollup -c --configDebug"
},
"dependencies": {
"monaco-editor": "^0.32"
"monaco-editor": "^0.41"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^13.0.0",
Expand Down
25 changes: 7 additions & 18 deletions src/api/editor.rs
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
use super::TextModel;
use crate::sys::{
use crate::sys::monaco;
use crate::sys::monaco::{
editor::{
self,
BuiltinTheme,
ConfigurationChangedEvent,
EditorLayoutInfo,
IContentSizeChangedEvent,
ICursorPositionChangedEvent,
ICursorSelectionChangedEvent,
IDimension,
IEditorMouseEvent,
IModelChangedEvent,
IModelContentChangedEvent,
IModelLanguageChangedEvent,
IModelOptionsChangedEvent,
IPasteEvent,
IStandaloneCodeEditor,
self, BuiltinTheme, ConfigurationChangedEvent, EditorLayoutInfo, IContentSizeChangedEvent,
ICursorPositionChangedEvent, ICursorSelectionChangedEvent, IDimension, IEditorMouseEvent,
IModelChangedEvent, IModelContentChangedEvent, IModelLanguageChangedEvent,
IModelOptionsChangedEvent, IPasteEvent, IStandaloneCodeEditor,
IStandaloneEditorConstructionOptions,
},
IKeyboardEvent,
IScrollEvent,
IKeyboardEvent, IScrollEvent,
};
use std::borrow::Borrow;
use wasm_bindgen::JsValue;
Expand Down
2 changes: 1 addition & 1 deletion src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//!
//! Most of the types here are simply wrappers around the Javascript types and
//! implement [`AsRef`] for them.
use crate::sys::IDisposable;
use crate::sys::monaco::IDisposable;
pub use editor::*;
pub use model::*;
use wasm_bindgen::closure::Closure;
Expand Down
7 changes: 2 additions & 5 deletions src/api/model.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use crate::sys::{
use crate::sys::monaco::{
editor::{
self,
IModelContentChangedEvent,
IModelLanguageChangedEvent,
IModelOptionsChangedEvent,
self, IModelContentChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent,
ITextModel,
},
Uri,
Expand Down
4 changes: 2 additions & 2 deletions src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ macro_rules! int_enum {
}
) => {
_lit_enum_commons! {
u32, u32;
i32, i32;
$(#[$meta])*
$vis enum $name {
$(
Expand All @@ -122,7 +122,7 @@ macro_rules! int_enum {

unsafe fn from_abi(abi: Self::Abi) -> Self {
let js_value = <$crate::macros::exports::JsValue as $crate::macros::exports::FromWasmAbi>::from_abi(abi);
let value = js_value.as_f64().expect("received non-number") as u32;
let value = js_value.as_f64().expect("received non-number") as i32;
Self::from_value(value).expect("received value outside of enum")
}
}
Expand Down
Loading