Bug 1953415 - [devtools] Remove CM5 code for the Exceptions Component r=devtools-reviewers,ochameau (773021d7) · Commits · The Tor Project / Applications / Tor Browser

devtools/client/debugger/src/components/Editor/Exception.js

deleted100644 → 0

+0 −102

Original line number	Diff line number	Diff line
		/* This Source Code Form is subject to the terms of the Mozilla Public
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */

		import { PureComponent } from "devtools/client/shared/vendor/react";
		import PropTypes from "devtools/client/shared/vendor/react-prop-types";

		import {
		toEditorPosition,
		getTokenEnd,
		hasDocument,
		} from "../../utils/editor/index";

		import { getIndentation } from "../../utils/indentation";
		import { createLocation } from "../../utils/location";

		export default class Exception extends PureComponent {
		exceptionLine;
		markText;

		static get propTypes() {
		return {
		exception: PropTypes.object.isRequired,
		doc: PropTypes.object.isRequired,
		selectedSource: PropTypes.string.isRequired,
		};
		}

		componentDidMount() {
		this.addEditorExceptionLine();
		}

		componentDidUpdate() {
		this.clearEditorExceptionLine();
		this.addEditorExceptionLine();
		}

		componentWillUnmount() {
		this.clearEditorExceptionLine();
		}

		setEditorExceptionLine(doc, line, column, lineText) {
		doc.addLineClass(line, "wrap", "line-exception");

		column = Math.max(column, getIndentation(lineText));
		const columnEnd = doc.cm ? getTokenEnd(doc.cm, line, column) : null;

		const markText = doc.markText(
		{ ch: column, line },
		{ ch: columnEnd, line },
		{ className: "mark-text-exception" }
		);

		this.exceptionLine = line;
		this.markText = markText;
		}

		addEditorExceptionLine() {
		const { exception, doc, selectedSource } = this.props;
		const { columnNumber, lineNumber } = exception;

		if (!hasDocument(selectedSource.id)) {
		return;
		}

		const location = createLocation({
		source: selectedSource,
		line: lineNumber,
		// Exceptions are reported with column being 1-based
		// while the frontend uses 0-based column.
		column: columnNumber - 1,
		});

		const { line, column } = toEditorPosition(location);
		const lineText = doc.getLine(line);

		this.setEditorExceptionLine(doc, line, column, lineText);
		}

		clearEditorExceptionLine() {
		if (this.markText) {
		const { selectedSource } = this.props;

		this.markText.clear();

		if (hasDocument(selectedSource.id)) {
		this.props.doc.removeLineClass(
		this.exceptionLine,
		"wrap",
		"line-exception"
		);
		}
		this.exceptionLine = null;
		this.markText = null;
		}
		}

		// This component is only used as a "proxy" to manipulate the editor.
		render() {
		return null;
		}
		}

devtools/client/debugger/src/components/Editor/Exceptions.js

+4 −35

Original line number	Diff line number	Diff line
		@@ -2,15 +2,11 @@
		* License, v. 2.0. If a copy of the MPL was not distributed with this
		* file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */

		import React, { Component } from "devtools/client/shared/vendor/react";
		import { Component } from "devtools/client/shared/vendor/react";
		import PropTypes from "devtools/client/shared/vendor/react-prop-types";
		import { connect } from "devtools/client/shared/vendor/react-redux";

		import { getDocument } from "../../utils/editor/index";
		import { markerTypes } from "../../constants";
		import { features } from "../../utils/prefs";

		import Exception from "./Exception";

		import {
		getSelectedSource,
		@@ -41,7 +37,7 @@ class Exceptions extends Component {

		clearMarkers(prevProps) {
		const { exceptions, selectedSource, editor } = this.props;
		if (!features.codemirrorNext \|\| !editor) {
		if (!editor) {
		return;
		}

		@@ -57,12 +53,7 @@ class Exceptions extends Component {

		setMarkers() {
		const { exceptions, selectedSource, editor } = this.props;
		if (
		!features.codemirrorNext \|\|
		!selectedSource \|\|
		!editor \|\|
		!exceptions.length
		) {
		if (!selectedSource \|\| !editor \|\| !exceptions.length) {
		return;
		}

		@@ -85,30 +76,8 @@ class Exceptions extends Component {
		}

		render() {
		const { exceptions, selectedSource } = this.props;

		if (features.codemirrorNext) {
		return null;
		}

		if (!selectedSource \|\| !exceptions.length) {
		return null;
		}

		const doc = getDocument(selectedSource.id);
		return React.createElement(
		React.Fragment,
		null,
		exceptions.map(exception =>
		React.createElement(Exception, {
		exception,
		doc,
		key: `${exception.sourceActorId}:${exception.lineNumber}`,
		selectedSource,
		})
		)
		);
		}
		}

		export default connect(state => {

devtools/client/debugger/src/components/Editor/moz.build

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ CompiledModules(
		"ConditionalPanel.js",
		"DebugLine.js",
		"EmptyLines.js",
		"Exception.js",
		"Exceptions.js",
		"Footer.js",
		"HighlightLine.js",