Skip to content

Commit

Permalink
adopt monaco-editor-core and extensions, update release notes.
Browse files Browse the repository at this point in the history
  • Loading branch information
rebornix committed Aug 17, 2017
1 parent 1b369b6 commit e5c6427
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 29 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Monaco Editor Change log

## [0.10.0] (17.08.2017)

### Breaking changes
* Removed `CodeAction`.
* Method `provideCodeActions` in `CodeActionProvider` now returns `Command[] | Thenable<Command[]` instead of `CodeAction[] | Thenable<CodeAction[]>`, which is already removed.

### API changes
* added `monaco.editor.getModelMarkers`. Get markers for owner and/or resource.

### Notable Fixes
* No longer use CSS class `.row` for command palette to avoid CSS conflicts with Bootstrap.
* Fix Accessibility Help Dialog accessible issue on IE/Edge.
* Fix Find Widget CSS compability issues with IE11.
* Toggle Block Comment can remove extra whitespaces.

### Thank you
* [Kitson Kelly @kitsonk](https://github.com/kitsonk): Update monaco-typescript to TypeScript 2.4.1 [PR monaco-typescript#15](https://github.com/Microsoft/monaco-typescript/pull/15)
* [@duncanwerner](https://github.com/duncanwerner): Add hex number tokenization to R language [PR monaco-languages#21](https://github.com/Microsoft/monaco-languages/pull/21)
* [Remy Suen @rcjsuen](https://github.com/rcjsuen): Update Dockerfile grammar with STOPSIGNAL and SHELL instructions [PR monaco-languages#22](https://github.com/Microsoft/monaco-languages/pull/22)
* [Marlene Cota @marlenecota](https://github.com/marlenecota): Add Small Basic support [PR monaco-languages#23](https://github.com/Microsoft/monaco-languages/pull/23)
* [Ben Jacobson @bjacobso](https://github.com/bjacobso): Add LIMIT to sql keywords [PR monaco-languages#24](https://github.com/Microsoft/monaco-languages/pull/24)
* to the many others that have contributed PRs to [vscode](https://github.com/Microsoft/vscode) which have also made their way into the monaco-editor.

## [0.9.0] (03.07.2017)

### New & Noteworthy
Expand Down
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,11 @@ Open [http://localhost:8080/monaco-editor/test/?editor=dev&monaco-typescript=dev
* open `http://localhost:8080/monaco-editor/test/smoketest.html?editor=releaseDev`
* open `http://localhost:8080/monaco-editor/test/smoketest.html?editor=releaseMin`

#### 5. Publish
#### 5. Update release note.
* API Change/Breaking Change/New and noteworthy
* Thank you

#### 6. Publish

* `/src/monaco-editor> npm version minor`
* `/src/monaco-editor/release> npm publish`
Expand Down
37 changes: 26 additions & 11 deletions monaco.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ declare module monaco {
* The value callback to complete a promise
*/
export interface TValueCallback<T> {
(value: T): void;
(value: T | Thenable<T>): void;
}


Expand Down Expand Up @@ -135,7 +135,6 @@ declare module monaco {
*/
export class Uri {
static isUri(thing: any): thing is Uri;
protected constructor();
/**
* scheme is the 'http' part of 'http://www.msft.com/some/path?query#fragment'.
* The part before the first colon.
Expand Down Expand Up @@ -839,6 +838,17 @@ declare module monaco.editor {
*/
export function setModelMarkers(model: IModel, owner: string, markers: IMarkerData[]): void;

/**
* Get markers for owner ant/or resource
* @returns {IMarkerData[]} list of markers
* @param filter
*/
export function getModelMarkers(filter: {
owner?: string;
resource?: Uri;
take?: number;
}): IMarker[];

/**
* Get the model that has `uri` if it exists.
*/
Expand Down Expand Up @@ -1035,6 +1045,19 @@ declare module monaco.editor {
[index: string]: any;
}

export interface IMarker {
owner: string;
resource: Uri;
severity: Severity;
code?: string;
message: string;
source?: string;
startLineNumber: number;
startColumn: number;
endLineNumber: number;
endColumn: number;
}

/**
* A structure defining a problem/warning/etc.
*/
Expand Down Expand Up @@ -4055,7 +4078,7 @@ declare module monaco.languages {
/**
* Provide commands for the given document and range.
*/
provideCodeActions(model: editor.IReadOnlyModel, range: Range, context: CodeActionContext, token: CancellationToken): CodeAction[] | Thenable<CodeAction[]>;
provideCodeActions(model: editor.IReadOnlyModel, range: Range, context: CodeActionContext, token: CancellationToken): Command[] | Thenable<Command[]>;
}

/**
Expand Down Expand Up @@ -4430,14 +4453,6 @@ declare module monaco.languages {
provideHover(model: editor.IReadOnlyModel, position: Position, token: CancellationToken): Hover | Thenable<Hover>;
}

/**
* Interface used to quick fix typing errors while accesing member fields.
*/
export interface CodeAction {
command: Command;
score: number;
}

/**
* Represents a parameter of a callable-signature. A parameter can
* have a label and a doc-comment.
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"gulp": "^3.9.1",
"gulp-typedoc": "^2.0.0",
"http-server": "^0.9.0",
"monaco-css": "1.3.2",
"monaco-editor-core": "0.9.0",
"monaco-html": "1.3.1",
"monaco-json": "1.3.1",
"monaco-languages": "0.8.0",
"monaco-typescript": "2.2.0",
"monaco-css": "1.3.3",
"monaco-editor-core": "0.10.0",
"monaco-html": "1.3.2",
"monaco-json": "1.3.2",
"monaco-languages": "0.9.0",
"monaco-typescript": "2.3.0",
"rimraf": "^2.5.2",
"typedoc": "^0.8.0",
"uncss": "^0.14.1"
Expand Down
37 changes: 26 additions & 11 deletions website/playground/monaco.d.ts.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ declare module monaco {
* The value callback to complete a promise
*/
export interface TValueCallback<T> {
(value: T): void;
(value: T | Thenable<T>): void;
}


Expand Down Expand Up @@ -135,7 +135,6 @@ declare module monaco {
*/
export class Uri {
static isUri(thing: any): thing is Uri;
protected constructor();
/**
* scheme is the 'http' part of 'http://www.msft.com/some/path?query#fragment'.
* The part before the first colon.
Expand Down Expand Up @@ -839,6 +838,17 @@ declare module monaco.editor {
*/
export function setModelMarkers(model: IModel, owner: string, markers: IMarkerData[]): void;

/**
* Get markers for owner ant/or resource
* @returns {IMarkerData[]} list of markers
* @param filter
*/
export function getModelMarkers(filter: {
owner?: string;
resource?: Uri;
take?: number;
}): IMarker[];

/**
* Get the model that has `uri` if it exists.
*/
Expand Down Expand Up @@ -1035,6 +1045,19 @@ declare module monaco.editor {
[index: string]: any;
}

export interface IMarker {
owner: string;
resource: Uri;
severity: Severity;
code?: string;
message: string;
source?: string;
startLineNumber: number;
startColumn: number;
endLineNumber: number;
endColumn: number;
}

/**
* A structure defining a problem/warning/etc.
*/
Expand Down Expand Up @@ -4055,7 +4078,7 @@ declare module monaco.languages {
/**
* Provide commands for the given document and range.
*/
provideCodeActions(model: editor.IReadOnlyModel, range: Range, context: CodeActionContext, token: CancellationToken): CodeAction[] | Thenable<CodeAction[]>;
provideCodeActions(model: editor.IReadOnlyModel, range: Range, context: CodeActionContext, token: CancellationToken): Command[] | Thenable<Command[]>;
}

/**
Expand Down Expand Up @@ -4430,14 +4453,6 @@ declare module monaco.languages {
provideHover(model: editor.IReadOnlyModel, position: Position, token: CancellationToken): Hover | Thenable<Hover>;
}

/**
* Interface used to quick fix typing errors while accesing member fields.
*/
export interface CodeAction {
command: Command;
score: number;
}

/**
* Represents a parameter of a callable-signature. A parameter can
* have a label and a doc-comment.
Expand Down

0 comments on commit e5c6427

Please sign in to comment.