2022-01-24 02:43:09 +01:00
|
|
|
<!--
|
|
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
-->
|
|
|
|
<script lang="ts">
|
Move away from Bazel (#2202)
(for upgrading users, please see the notes at the bottom)
Bazel brought a lot of nice things to the table, such as rebuilds based on
content changes instead of modification times, caching of build products,
detection of incorrect build rules via a sandbox, and so on. Rewriting the build
in Bazel was also an opportunity to improve on the Makefile-based build we had
prior, which was pretty poor: most dependencies were external or not pinned, and
the build graph was poorly defined and mostly serialized. It was not uncommon
for fresh checkouts to fail due to floating dependencies, or for things to break
when trying to switch to an older commit.
For day-to-day development, I think Bazel served us reasonably well - we could
generally switch between branches while being confident that builds would be
correct and reasonably fast, and not require full rebuilds (except on Windows,
where the lack of a sandbox and the TS rules would cause build breakages when TS
files were renamed/removed).
Bazel achieves that reliability by defining rules for each programming language
that define how source files should be turned into outputs. For the rules to
work with Bazel's sandboxing approach, they often have to reimplement or
partially bypass the standard tools that each programming language provides. The
Rust rules call Rust's compiler directly for example, instead of using Cargo,
and the Python rules extract each PyPi package into a separate folder that gets
added to sys.path.
These separate language rules allow proper declaration of inputs and outputs,
and offer some advantages such as caching of build products and fine-grained
dependency installation. But they also bring some downsides:
- The rules don't always support use-cases/platforms that the standard language
tools do, meaning they need to be patched to be used. I've had to contribute a
number of patches to the Rust, Python and JS rules to unblock various issues.
- The dependencies we use with each language sometimes make assumptions that do
not hold in Bazel, meaning they either need to be pinned or patched, or the
language rules need to be adjusted to accommodate them.
I was hopeful that after the initial setup work, things would be relatively
smooth-sailing. Unfortunately, that has not proved to be the case. Things
frequently broke when dependencies or the language rules were updated, and I
began to get frustrated at the amount of Anki development time I was instead
spending on build system upkeep. It's now about 2 years since switching to
Bazel, and I think it's time to cut losses, and switch to something else that's
a better fit.
The new build system is based on a small build tool called Ninja, and some
custom Rust code in build/. This means that to build Anki, Bazel is no longer
required, but Ninja and Rust need to be installed on your system. Python and
Node toolchains are automatically downloaded like in Bazel.
This new build system should result in faster builds in some cases:
- Because we're using cargo to build now, Rust builds are able to take advantage
of pipelining and incremental debug builds, which we didn't have with Bazel.
It's also easier to override the default linker on Linux/macOS, which can
further improve speeds.
- External Rust crates are now built with opt=1, which improves performance
of debug builds.
- Esbuild is now used to transpile TypeScript, instead of invoking the TypeScript
compiler. This results in faster builds, by deferring typechecking to test/check
time, and by allowing more work to happen in parallel.
As an example of the differences, when testing with the mold linker on Linux,
adding a new message to tags.proto (which triggers a recompile of the bulk of
the Rust and TypeScript code) results in a compile that goes from about 22s on
Bazel to about 7s in the new system. With the standard linker, it's about 9s.
Some other changes of note:
- Our Rust workspace now uses cargo-hakari to ensure all packages agree on
available features, preventing unnecessary rebuilds.
- pylib/anki is now a PEP420 implicit namespace, avoiding the need to merge
source files and generated files into a single folder for running. By telling
VSCode about the extra search path, code completion now works with generated
files without needing to symlink them into the source folder.
- qt/aqt can't use PEP420 as it's difficult to get rid of aqt/__init__.py.
Instead, the generated files are now placed in a separate _aqt package that's
added to the path.
- ts/lib is now exposed as @tslib, so the source code and generated code can be
provided under the same namespace without a merging step.
- MyPy and PyLint are now invoked once for the entire codebase.
- dprint will be used to format TypeScript/json files in the future instead of
the slower prettier (currently turned off to avoid causing conflicts). It can
automatically defer to prettier when formatting Svelte files.
- svelte-check is now used for typechecking our Svelte code, which revealed a
few typing issues that went undetected with the old system.
- The Jest unit tests now work on Windows as well.
If you're upgrading from Bazel, updated usage instructions are in docs/development.md and docs/build.md. A summary of the changes:
- please remove node_modules and .bazel
- install rustup (https://rustup.rs/)
- install rsync if not already installed (on windows, use pacman - see docs/windows.md)
- install Ninja (unzip from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
place on your path, or from your distro/homebrew if it's 1.10+)
- update .vscode/settings.json from .vscode.dist
2022-11-27 06:24:20 +01:00
|
|
|
import * as tr from "@tslib/ftl";
|
|
|
|
import { getPlatformString } from "@tslib/shortcuts";
|
|
|
|
import { wrapInternal } from "@tslib/wrap";
|
2022-11-28 00:17:39 +01:00
|
|
|
|
2022-01-24 02:43:09 +01:00
|
|
|
import DropdownItem from "../../components/DropdownItem.svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
import IconButton from "../../components/IconButton.svelte";
|
2022-03-02 05:21:19 +01:00
|
|
|
import Popover from "../../components/Popover.svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
import Shortcut from "../../components/Shortcut.svelte";
|
2022-03-02 05:21:19 +01:00
|
|
|
import WithFloating from "../../components/WithFloating.svelte";
|
2022-08-18 04:06:06 +02:00
|
|
|
import { mathjaxConfig } from "../../editable/mathjax-element";
|
2022-02-03 05:52:11 +01:00
|
|
|
import { context as noteEditorContext } from "../NoteEditor.svelte";
|
2022-01-24 02:43:09 +01:00
|
|
|
import type { RichTextInputAPI } from "../rich-text-input";
|
2022-02-03 05:52:11 +01:00
|
|
|
import { editingInputIsRichText } from "../rich-text-input";
|
2022-02-04 09:36:34 +01:00
|
|
|
import { functionIcon } from "./icons";
|
2022-01-24 02:43:09 +01:00
|
|
|
|
2022-02-03 05:52:11 +01:00
|
|
|
const { focusedInput } = noteEditorContext.get();
|
|
|
|
$: richTextAPI = $focusedInput as RichTextInputAPI;
|
2022-01-24 02:43:09 +01:00
|
|
|
|
|
|
|
async function surround(front: string, back: string): Promise<void> {
|
|
|
|
const element = await richTextAPI.element;
|
|
|
|
wrapInternal(element, front, back, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
function onMathjaxInline(): void {
|
2022-10-12 06:34:25 +02:00
|
|
|
if (mathjaxConfig.enabled) {
|
|
|
|
surround("<anki-mathjax focusonmount>", "</anki-mathjax>");
|
|
|
|
} else {
|
|
|
|
surround("\\(", "\\)");
|
|
|
|
}
|
2022-01-24 02:43:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
function onMathjaxBlock(): void {
|
2022-10-12 06:34:25 +02:00
|
|
|
if (mathjaxConfig.enabled) {
|
|
|
|
surround('<anki-mathjax block="true" focusonmount>', "</anki-matjax>");
|
|
|
|
} else {
|
|
|
|
surround("\\[", "\\]");
|
|
|
|
}
|
2022-01-24 02:43:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
function onMathjaxChemistry(): void {
|
2022-10-12 06:34:25 +02:00
|
|
|
if (mathjaxConfig.enabled) {
|
|
|
|
surround('<anki-mathjax focusonmount="0,4">\\ce{', "}</anki-mathjax>");
|
|
|
|
} else {
|
|
|
|
surround("\\(\\ce{", "}\\)");
|
|
|
|
}
|
2022-01-24 02:43:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
function onLatex(): void {
|
|
|
|
surround("[latex]", "[/latex]");
|
|
|
|
}
|
|
|
|
|
|
|
|
function onLatexEquation(): void {
|
|
|
|
surround("[$]", "[/$]");
|
|
|
|
}
|
|
|
|
|
|
|
|
function onLatexMathEnv(): void {
|
|
|
|
surround("[$$]", "[/$$]");
|
|
|
|
}
|
|
|
|
|
|
|
|
type LatexItem = [() => void, string, string];
|
|
|
|
|
|
|
|
const dropdownItems: LatexItem[] = [
|
|
|
|
[onMathjaxInline, "Control+M, M", tr.editingMathjaxInline()],
|
|
|
|
[onMathjaxBlock, "Control+M, E", tr.editingMathjaxBlock()],
|
|
|
|
[onMathjaxChemistry, "Control+M, C", tr.editingMathjaxChemistry()],
|
|
|
|
[onLatex, "Control+T, T", tr.editingLatex()],
|
|
|
|
[onLatexEquation, "Control+T, E", tr.editingLatexEquation()],
|
|
|
|
[onLatexMathEnv, "Control+T, M", tr.editingLatexMathEnv()],
|
|
|
|
];
|
|
|
|
|
2022-10-27 01:11:36 +02:00
|
|
|
$: disabled = !$focusedInput || !editingInputIsRichText($focusedInput);
|
2022-03-02 05:21:19 +01:00
|
|
|
|
2022-09-05 09:20:00 +02:00
|
|
|
let showFloating = false;
|
2022-12-19 03:07:47 +01:00
|
|
|
$: if (disabled) {
|
|
|
|
showFloating = false;
|
|
|
|
}
|
2022-01-24 02:43:09 +01:00
|
|
|
</script>
|
|
|
|
|
2022-09-05 09:20:00 +02:00
|
|
|
<WithFloating
|
2022-12-19 03:07:47 +01:00
|
|
|
show={showFloating}
|
2022-09-05 09:20:00 +02:00
|
|
|
closeOnInsideClick
|
|
|
|
inline
|
|
|
|
on:close={() => (showFloating = false)}
|
|
|
|
>
|
2022-09-30 03:43:08 +02:00
|
|
|
<IconButton
|
|
|
|
slot="reference"
|
2023-05-11 07:04:35 +02:00
|
|
|
tooltip={tr.editingEquations()}
|
2022-09-30 03:43:08 +02:00
|
|
|
{disabled}
|
|
|
|
on:click={() => (showFloating = !showFloating)}
|
|
|
|
>
|
|
|
|
{@html functionIcon}
|
|
|
|
</IconButton>
|
2022-01-24 02:43:09 +01:00
|
|
|
|
Fuzzy search in symbol insertion overlay (#2059)
* Add flag for enabling insert symbols feature
* Add symbols overlay directory
* Detect if :xy is inserted into editable
* Allow naive updating of overlay, and special handling of ':'
* First step towards better Virtual Element support
* Update floating to reference range on insert text
* Position SymbolsOverlay always on top or bottom
* Add a data-provider to emulate API
* Show correct suggestions in symbols overlay
* Rename to replacementLength
* Allow replacing via clicking in menu
* Optionally remove inline padding of Popover
* Hide Symbols overlay on blur of content editable
* Add specialKey to inputHandler and generalize how arrow movement is detected
- This way macOS users can use Ctrl-N to mean down, etc.
* Detect special key from within SymbolsOverlay
* Implement full backwards search while typing
* Allow navigating symbol menu and accepting with enter
* Add some entries to data-provider
* Satisfy eslint
* Generate symbolsTable from sources
* Use other github source, allow multiple names
In return, symbol must be unique
* Automatically scroll in symbols dropdown
* Use from npm packages rather than downloading from URL
* Remove console.log
* Remove print
Co-authored-by: Damien Elmes <dae@users.noreply.github.com>
* Add pointerDown event to input-handler
- so that SymbolsOverlay can reset on field click
* Make tab do the same as enter
* Make font a bit smaller but increase relative icon size
* Satisfy type requirement of handlerlist
* Revert changing default size of DropdownItems
* Remove some now unused code for bootstrap dropdowns
* Use fuse to allow fuzzy searching of symbols
* Remove unnecessary async handling in data-provider
I did that because at first I was still expecting to fetch the symbols
from the backend
* Apply field font family in symbol preview
* Remove inline padding from latex popover
* Rename data-provier to symbols-table
* Add some explaining comments to interface
* Allow for auto insertion symbols
* Use deleteData and after instead of replaceData
* Allow using html in symbols
* Show html symbols as html
* Add SymbolsEntry component
* Also include containshtml at low search precedence
* Put character entities and gemoji into their own files
* Factor out prepareInsertion method
* Allow deletion while searching for correct symbol
* Respect insertCompositionText
* Delete data-provider
* Restrict auto insert queries to max 5 characters
* Satisfy svelte check
* Fix the overlay sometimes not showing
This will make sure to always normalize text nodes before searching.
However it adjacent text is partially formatted, this will still not
find the whole query.
For example, currently, entering `<b>:for</b>al` and then inputting `l`,
will not trigger a search for `forall`, because of the <b> formatting
* Add empty line
* Do not trigger overlay, when last character is whitespace or colon
* Add missing fuse license
2022-09-13 06:19:19 +02:00
|
|
|
<Popover slot="floating" --popover-padding-inline="0">
|
2022-01-24 02:43:09 +01:00
|
|
|
{#each dropdownItems as [callback, keyCombination, label]}
|
2022-12-14 05:10:23 +01:00
|
|
|
<DropdownItem on:click={() => setTimeout(callback, 100)}>
|
2022-09-05 09:20:00 +02:00
|
|
|
<span>{label}</span>
|
2022-02-22 13:17:22 +01:00
|
|
|
<span class="ms-auto ps-2 shortcut"
|
|
|
|
>{getPlatformString(keyCombination)}</span
|
|
|
|
>
|
2022-01-24 02:43:09 +01:00
|
|
|
</DropdownItem>
|
|
|
|
{/each}
|
2022-03-02 05:21:19 +01:00
|
|
|
</Popover>
|
|
|
|
</WithFloating>
|
2022-02-22 13:17:22 +01:00
|
|
|
|
2022-09-05 09:20:00 +02:00
|
|
|
{#each dropdownItems as [callback, keyCombination]}
|
|
|
|
<Shortcut {keyCombination} on:action={callback} />
|
|
|
|
{/each}
|
2022-03-11 06:48:49 +01:00
|
|
|
|
2022-09-05 09:20:00 +02:00
|
|
|
<style lang="scss">
|
2022-02-22 13:17:22 +01:00
|
|
|
.shortcut {
|
|
|
|
font: Verdana;
|
|
|
|
}
|
|
|
|
</style>
|