Isolate build step to CM6 library and restructure files to work with RL
CodeMirror 6 requires the use of NPM, but we can still bundle all CM
packages into one file, and then everything else (i.e. our code) is
managed by ResourceLoader as per usual. This makes contribution
considerably easier as we no longer need a build step for each change.
CM5 files are now under resources/legacy, and the CM6 files are moved to
the root of the resources/ directory. Only one file,
codemirror.bundle.js, is managed by Rollup, while everything else is RL.
The Rollup output for now is put under resources/lib/ alongside the CM5
upstream files.
This patch is *mostly* renames of files, along with changing ECMAScript
Module (ESM) syntax into the CommonJS style that ResourceLoader prefers.
We also remove more modern JS syntax (i.e. private class methods) that
we were able to use before because we had a build step with Babel.
This patch should effectively make no user-facing changes, or to the
ResourceLoader modules we offer in Extension:CodeMirror.
Finally, bump version in extension.json to 6, to match the upstream lib,
and add Bhsd as an author :-)
Bug: T368053
Change-Id: Ie258e49f5df8db23a7344ac3c4c9300aaa991042
2024-06-21 03:21:09 +00:00
|
|
|
const {
|
2024-03-11 21:34:36 +00:00
|
|
|
Decoration,
|
|
|
|
DecorationSet,
|
|
|
|
Direction,
|
|
|
|
EditorView,
|
|
|
|
PluginSpec,
|
Isolate build step to CM6 library and restructure files to work with RL
CodeMirror 6 requires the use of NPM, but we can still bundle all CM
packages into one file, and then everything else (i.e. our code) is
managed by ResourceLoader as per usual. This makes contribution
considerably easier as we no longer need a build step for each change.
CM5 files are now under resources/legacy, and the CM6 files are moved to
the root of the resources/ directory. Only one file,
codemirror.bundle.js, is managed by Rollup, while everything else is RL.
The Rollup output for now is put under resources/lib/ alongside the CM5
upstream files.
This patch is *mostly* renames of files, along with changing ECMAScript
Module (ESM) syntax into the CommonJS style that ResourceLoader prefers.
We also remove more modern JS syntax (i.e. private class methods) that
we were able to use before because we had a build step with Babel.
This patch should effectively make no user-facing changes, or to the
ResourceLoader modules we offer in Extension:CodeMirror.
Finally, bump version in extension.json to 6, to match the upstream lib,
and add Bhsd as an author :-)
Bug: T368053
Change-Id: Ie258e49f5df8db23a7344ac3c4c9300aaa991042
2024-06-21 03:21:09 +00:00
|
|
|
Prec,
|
|
|
|
RangeSet,
|
|
|
|
RangeSetBuilder,
|
2024-03-11 21:34:36 +00:00
|
|
|
ViewPlugin,
|
Isolate build step to CM6 library and restructure files to work with RL
CodeMirror 6 requires the use of NPM, but we can still bundle all CM
packages into one file, and then everything else (i.e. our code) is
managed by ResourceLoader as per usual. This makes contribution
considerably easier as we no longer need a build step for each change.
CM5 files are now under resources/legacy, and the CM6 files are moved to
the root of the resources/ directory. Only one file,
codemirror.bundle.js, is managed by Rollup, while everything else is RL.
The Rollup output for now is put under resources/lib/ alongside the CM5
upstream files.
This patch is *mostly* renames of files, along with changing ECMAScript
Module (ESM) syntax into the CommonJS style that ResourceLoader prefers.
We also remove more modern JS syntax (i.e. private class methods) that
we were able to use before because we had a build step with Babel.
This patch should effectively make no user-facing changes, or to the
ResourceLoader modules we offer in Extension:CodeMirror.
Finally, bump version in extension.json to 6, to match the upstream lib,
and add Bhsd as an author :-)
Bug: T368053
Change-Id: Ie258e49f5df8db23a7344ac3c4c9300aaa991042
2024-06-21 03:21:09 +00:00
|
|
|
ViewUpdate,
|
|
|
|
syntaxTree
|
|
|
|
} = require( 'ext.CodeMirror.v6.lib' );
|
|
|
|
const mwModeConfig = require( './codemirror.mediawiki.config.js' );
|
2024-03-11 21:34:36 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @type {Decoration}
|
2024-03-19 03:10:11 +00:00
|
|
|
* @private
|
2024-03-11 21:34:36 +00:00
|
|
|
*/
|
|
|
|
const isolate = Decoration.mark( {
|
|
|
|
class: 'cm-bidi-isolate',
|
|
|
|
bidiIsolate: Direction.LTR
|
|
|
|
} );
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param {EditorView} view
|
|
|
|
* @return {RangeSet}
|
2024-03-19 03:10:11 +00:00
|
|
|
* @private
|
2024-03-11 21:34:36 +00:00
|
|
|
*/
|
|
|
|
function computeIsolates( view ) {
|
|
|
|
const set = new RangeSetBuilder();
|
|
|
|
|
2024-06-08 03:10:11 +00:00
|
|
|
if ( view.editorAttrs.dir === 'rtl' ) {
|
|
|
|
for ( const { from, to } of view.visibleRanges ) {
|
|
|
|
let startPos = null;
|
|
|
|
syntaxTree( view.state ).iterate( {
|
|
|
|
from,
|
|
|
|
to,
|
|
|
|
enter( node ) {
|
|
|
|
// Determine if this is a bracket node (start or end of a tag).
|
|
|
|
const isBracket = node.name.split( '_' )
|
|
|
|
.some( ( tag ) => [
|
|
|
|
mwModeConfig.tags.htmlTagBracket,
|
|
|
|
mwModeConfig.tags.extTagBracket
|
|
|
|
].includes( tag ) );
|
2024-03-11 21:34:36 +00:00
|
|
|
|
2024-06-08 03:10:11 +00:00
|
|
|
if ( startPos === null && isBracket ) {
|
|
|
|
// If we find a bracket node, we keep track of the start position.
|
|
|
|
startPos = node.from;
|
|
|
|
} else if ( isBracket ) {
|
|
|
|
// When we find the closing bracket, add the isolate.
|
|
|
|
set.add( startPos, node.to, isolate );
|
|
|
|
startPos = null;
|
|
|
|
}
|
2024-03-11 21:34:36 +00:00
|
|
|
}
|
2024-06-08 03:10:11 +00:00
|
|
|
} );
|
|
|
|
}
|
2024-03-11 21:34:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return set.finish();
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2024-03-19 03:10:11 +00:00
|
|
|
* @private
|
2024-03-11 21:34:36 +00:00
|
|
|
*/
|
|
|
|
class CodeMirrorBidiIsolation {
|
|
|
|
/**
|
|
|
|
* @constructor
|
2024-03-19 03:10:11 +00:00
|
|
|
* @param {EditorView} view The editor view.
|
2024-03-11 21:34:36 +00:00
|
|
|
*/
|
|
|
|
constructor( view ) {
|
2024-03-19 03:10:11 +00:00
|
|
|
/** @type {DecorationSet} */
|
2024-03-11 21:34:36 +00:00
|
|
|
this.isolates = computeIsolates( view );
|
2024-03-19 03:10:11 +00:00
|
|
|
/** @type {Tree} */
|
2024-03-11 21:34:36 +00:00
|
|
|
this.tree = syntaxTree( view.state );
|
2024-06-08 03:10:11 +00:00
|
|
|
/** @type {Direction} */
|
|
|
|
this.dir = view.textDirection;
|
2024-03-11 21:34:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param {ViewUpdate} update
|
|
|
|
*/
|
|
|
|
update( update ) {
|
|
|
|
if ( update.docChanged || update.viewportChanged ||
|
2024-06-08 03:10:11 +00:00
|
|
|
syntaxTree( update.state ) !== this.tree ||
|
|
|
|
update.view.textDirection !== this.dir
|
2024-03-11 21:34:36 +00:00
|
|
|
) {
|
|
|
|
this.isolates = computeIsolates( update.view );
|
|
|
|
this.tree = syntaxTree( update.state );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @type {PluginSpec}
|
2024-03-19 03:10:11 +00:00
|
|
|
* @private
|
2024-03-11 21:34:36 +00:00
|
|
|
*/
|
|
|
|
const bidiIsolationSpec = {
|
|
|
|
provide: ( plugin ) => {
|
|
|
|
/**
|
|
|
|
* @param {EditorView} view
|
|
|
|
* @return {DecorationSet}
|
|
|
|
*/
|
2024-06-14 11:51:53 +00:00
|
|
|
const access = ( view ) => view.plugin( plugin ) ?
|
|
|
|
( view.plugin( plugin ).isolates || Decoration.none ) :
|
|
|
|
Decoration.none;
|
2024-03-11 21:34:36 +00:00
|
|
|
|
|
|
|
// Use the lowest precedence to ensure that other decorations
|
|
|
|
// don't break up the isolating decorations.
|
|
|
|
return Prec.lowest( [
|
|
|
|
EditorView.decorations.of( access ),
|
|
|
|
EditorView.bidiIsolatedRanges.of( access )
|
|
|
|
] );
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2024-03-19 03:10:11 +00:00
|
|
|
/**
|
|
|
|
* Bidirectional isolation plugin for CodeMirror for use on RTL pages.
|
|
|
|
* This ensures HTML and MediaWiki tags are always displayed left-to-right.
|
|
|
|
*
|
|
|
|
* Use this plugin by passing in `bidiIsolation: true` when instantiating
|
|
|
|
* a [CodeMirrorModeMediaWiki]{@link CodeMirrorModeMediaWiki} object.
|
|
|
|
*
|
|
|
|
* @module CodeMirrorBidiIsolation
|
|
|
|
* @see https://codemirror.net/examples/bidi/
|
|
|
|
*/
|
Isolate build step to CM6 library and restructure files to work with RL
CodeMirror 6 requires the use of NPM, but we can still bundle all CM
packages into one file, and then everything else (i.e. our code) is
managed by ResourceLoader as per usual. This makes contribution
considerably easier as we no longer need a build step for each change.
CM5 files are now under resources/legacy, and the CM6 files are moved to
the root of the resources/ directory. Only one file,
codemirror.bundle.js, is managed by Rollup, while everything else is RL.
The Rollup output for now is put under resources/lib/ alongside the CM5
upstream files.
This patch is *mostly* renames of files, along with changing ECMAScript
Module (ESM) syntax into the CommonJS style that ResourceLoader prefers.
We also remove more modern JS syntax (i.e. private class methods) that
we were able to use before because we had a build step with Babel.
This patch should effectively make no user-facing changes, or to the
ResourceLoader modules we offer in Extension:CodeMirror.
Finally, bump version in extension.json to 6, to match the upstream lib,
and add Bhsd as an author :-)
Bug: T368053
Change-Id: Ie258e49f5df8db23a7344ac3c4c9300aaa991042
2024-06-21 03:21:09 +00:00
|
|
|
module.exports = ViewPlugin.fromClass( CodeMirrorBidiIsolation, bidiIsolationSpec );
|