helix-plus

Commit Graph

Author	SHA1	Message	Date
Gokul Soumya	8a2fa692f2	Refactor case where key event is solely a character	3 years ago
Nathan Vegdahl	cd7302ffd3	Enforce cursor/selection invariants in one place. Rather than per-command like before.	3 years ago
Nathan Vegdahl	a873e719d5	Merge branch 'master' into great_line_ending_and_cursor_range_cleanup	3 years ago
Rust & Python	581a3d42c8	Update keyboard.rs (#516 ) Fix doc comment typo	3 years ago
Nathan Vegdahl	f62ec6e51e	Merge branch 'master' into great_line_ending_and_cursor_range_cleanup	3 years ago
Nathan Vegdahl	5ee6ba5b38	Address some PR comments.	3 years ago
Gokul Soumya	88d6f65239	Allow multi key remappings in config file (#454 ) * Use tree like structure to store keymaps * Allow multi key keymaps in config file * Allow multi key keymaps in insert mode * Make keymap state self contained * Add keymap! macro for ergonomic declaration * Add descriptions for editor commands * Allow keymap! to take multiple keys * Restore infobox display * Fix keymap merging and add infobox titles * Fix and add tests for keymaps * Clean up comments and apply suggestions * Allow trailing commas in keymap! * Remove mode suffixes from keymaps * Preserve order of keys when showing infobox * Make command descriptions smaller * Strip infobox title prefix from items * Strip infobox title prefix from items	3 years ago
Nathan Vegdahl	0883b4fae0	Collect some common patterns into methods on `Range`.	3 years ago
Nathan Vegdahl	43594049dd	Merge branch 'master' into great_line_ending_and_cursor_range_cleanup	3 years ago
Shafkath Shuhan	25103833b2	mark reloaded buffers as unchanged	3 years ago
Nathan Vegdahl	198fe40951	Don't insert a final line ending on file load/reload.	3 years ago
Nathan Vegdahl	c848ed7abc	Fixes for misc bugs with view movement.	3 years ago
Nathan Vegdahl	d5534a6d10	Merge branch 'master' into great_line_ending_and_cursor_range_cleanup	3 years ago
Ivan Tham	17f9dfce7e	Fix typo	3 years ago
Nathan Vegdahl	b0311f4fc2	Fixed primary cursor position calculation to use 1-width semantics. This had a bunch of knock-on effects that were buggy, such as bracket match highlighting.	3 years ago
Nathan Vegdahl	079d4ed86d	Properly fix `last_line` view calculation. Turned out to be simpler than I thought. Didn't even need to change the other use-sites.	3 years ago
Nathan Vegdahl	a77274e8bb	Merge branch 'master' into great_line_ending_and_cursor_range_cleanup	3 years ago
Cor	9fcbbfa467	Changed startup behaviour to only open a single view when multiple files are specified on the commandline. Changed the behaviour; the first argument on the commandline is the file on display	3 years ago
Kirawi	0b1ed8656d	Fix #442 (#446 ) * fix #442 fix #442 fmt * create Rope from default line ending * Fix use of encoding in Document::open()	3 years ago
Blaž Hrastnik	d530d6e39d	Further simplify error handling in :commands	3 years ago
Lionel Flandrin	9c02a1b070	Make command implementation return a Result<()> The error message is displayed with cx.editor.set_error.	3 years ago
Nathan Vegdahl	85d5b399de	Merge branch 'master' into great_line_ending_and_cursor_range_cleanup	3 years ago
Blaž Hrastnik	fc34efea12	appease clippy	3 years ago
Blaž Hrastnik	48481db8ca	fix: Make path absolute before normalizing :open ../file.txt failed before because .. would be stripped	3 years ago
Blaž Hrastnik	b72c6204e5	fix: When calculating relative path, expand tilde last	3 years ago
Ivan Tham	916362d3a9	Info box add horizontal padding	3 years ago
Ivan Tham	5977b07e19	Reduce calculation and improve pattern in infobox - switch to use static OnceCell to calculate Info once - pass Vec<(&[KeyEvent], &str)> rather than Vec<(Vec<KeyEvent>, &str)> - expr -> tt to allow using \| as separator, make it more like match	3 years ago
Ivan Tham	9effe71b7d	Apply suggestions from blaz for infobox	3 years ago
Ivan Tham	8985c58fd3	Add infobox	3 years ago
Kirawi	c5b2973739	`:reload` (#374 ) * reloading functionality * fn with_newline_eof() * fmt * wip * wip * wip * wip * moved to core, added simd feature for encoding_rs * wip * rm * .gitignore * wip * local wip * wip * wip * no features * wip * nit * remove simd * doc * clippy * clippy * address comments * add indentation & line ending change	3 years ago
Nathan Vegdahl	28627f97e9	Fix empty document test.	3 years ago
Nathan Vegdahl	7961a13007	Make new documents empty, rather than starting with a line ending.	3 years ago
Nathan Vegdahl	22dca3b111	Allow last line in file to lack a line break character.	3 years ago
Nathan Vegdahl	7c7be6d583	Make `Selection`'s normalize and transform methods self-consuming only.	4 years ago
Nathan Vegdahl	0ae522f3df	Clean up `Selection` to not use so many allocations.	4 years ago
Jakub Bartodziej	79f096963c	Color palettes (#393 ) * Enable using color palettes in theme files. * Add an example theme defined using a gruvbox color palette. * Fix clippy error. * Small style improvement. * Add documentation for the features to themes.md. * Update runtime/themes/gruvbox.toml Fix the value of purple0. Co-authored-by: DrZingo <DrZingo@users.noreply.github.com> Co-authored-by: DrZingo <DrZingo@users.noreply.github.com>	4 years ago
Kirawi	acaf22d005	Added native Windows clipboard support (#373 ) * Added native Windows clipboard support * make conditional wip better conditional wip wip wip wip make conditional	4 years ago
Joe Neeman	2902a10a3e	Make Document's format API a little nicer.	4 years ago
Joe Neeman	c9be480bf8	Make formatting happen asynchronously.	4 years ago
Blaž Hrastnik	057bd630d8	Simplify selection rendering by injecting highlight scopes	4 years ago
Blaž Hrastnik	44566ea812	Release 0.3.0	4 years ago
Nathan Vegdahl	d534d6470f	Detect file language before file indent style. Fixes #378. The issue was that because indent style detection ran before language detection, there was no language indent style to fall back on if indent style detection failed, so it would just default to 2 spaces.	4 years ago
teenjuna	c688288881	Move helix-view/tests/txt files to txts subdirectory (#372 ) Move helix-view/tests/txt files to txts subdirectory Rename tests/txts to tests/encoding	4 years ago
Blaž Hrastnik	8e277ad8ba	fix: crossterm -> input key conversion	4 years ago
Keith Simmons	4418e17547	reverse the dependency between helix-tui and helix-view (#366 ) * reverse the dependency between helix-tui and helix-view by moving a fiew types to view * fix tests * clippy and format fixes Co-authored-by: Keith Simmons <keithsim@microsoft.com>	4 years ago
Ivan Tham	10548bf0e3	Fix previous broken refactor key into helix-view Need to be used for autoinfo Revert "Revert "Refactor key into helix-view"" This reverts commit `10f9f72232`.	4 years ago
Shafkath Shuhan	6564257a7b	add missing doc	4 years ago
nobody	7896eefd73	add tests	4 years ago
Shafkath Shuhan	fd98e743e8	Handle non-UTF8 files	4 years ago
Nathan Vegdahl	0cbaa998ce	Fix flipped condition where Helix adds a line ending on open.	4 years ago
Gokul Soumya	13648d28b9	Add surround keybinds	4 years ago
Blaž Hrastnik	a70de6e980	Merge pull request #224 from helix-editor/line_ending_detection Line ending detection	4 years ago
Nathan Vegdahl	07e28802f6	Add function to get the line ending of a str slice. This is needed in some places.	4 years ago
Nathan Vegdahl	714002048c	Don't need getters/setters for line_ending property. It's plain-old-data. If we want to do fancier things later, it's easy to switch back.	4 years ago
Blaž Hrastnik	994ff4b269	Don't run wl-copy with --foreground It stalls the hx process	4 years ago
Nathan Vegdahl	e686c3e462	Merge branch 'master' of github.com:helix-editor/helix into line_ending_detection Rebasing was making me manually fix conflicts on every commit, so merging instead.	4 years ago
Nathan Vegdahl	4efd6713c5	Work on moving code over to LineEnding instead of assuming '\n'. Also some general cleanup and some minor fixes along the way.	4 years ago
Ivan Tham	985625763a	Fix doc warnings	4 years ago
Benoît CORTIER	a2b8cfca34	Add system clipboard yank and paste commands This commit adds six new commands to interact with system clipboard: - clipboard-yank - clipboard-yank-join - clipboard-paste-after - clipboard-paste-before - clipboard-paste-replace - show-clipboard-provider System clipboard provider is detected by checking a few environment variables and executables. Currently only built-in detection is supported. `clipboard-yank` will only yank the "main" selection, which is currently the first one. This will need to be revisited later. Closes https://github.com/helix-editor/helix/issues/76	4 years ago
wojciechkepka	0882712b45	Use full screen size	4 years ago
Nathan Vegdahl	5d22e3c4e5	Misc fixes and clean up of line ending detect code.	4 years ago
Jan Hrastnik	701eb0dd68	changed some hardcoded newlines, removed a else if in line_ending.rs	4 years ago
wojciechkepka	6825e19509	Only reconfiure highlights when setting theme	4 years ago
wojciechkepka	ce97a2f05f	Add ability to change theme on editor	4 years ago
wojciechkepka	f424a61054	Add themes loader	4 years ago
Blaž Hrastnik	10f9f72232	Revert "Refactor key into helix-view" Did not use defaults when custom keymap was used This reverts commit `ca806d4f85`.	4 years ago
Jan Hrastnik	cdd9347457	Merge remote-tracking branch 'origin/master' into line_ending_detection	4 years ago
Ivan Tham	ca806d4f85	Refactor key into helix-view Now also make use of Deserialize for Config.	4 years ago
wojciechkepka	c5a2fd5da3	Add `close_language_servers` method on `Editor`	4 years ago
Benoît CORTIER	03d1ca7b0a	cargo: add more metadata to manifests	4 years ago
Benoît CORTIER	b48054f3ee	cargo: add version to local dependencies First step towards enabling us to publish on crates.io. See: https://github.com/helix-editor/helix/issues/42	4 years ago
wojciechkepka	a6d39585d8	Add `work_done_token` as parameter to lsp methods	4 years ago
Wojciech Kępka	41b07486ad	Fix expansion of `~` (#284 ) * Fix expansion of `~`, dont use directory relative to cwd. * Add `expand_tilde` * Bring back `canonicalize_path`, use `expand_tilde` to `normalize` * Make `:open ~` completion work * Fix clippy * Fold home dir into tilde in Document `realitve_path`	4 years ago
Benoît CORTIER	8664d70e73	Replace `Editor::current` by a macro This is necessary to workaround ownership issues across function calls. The issue notably arised when implementing the registers into `Editor` and I was getting annoyed again when implementing copy/pasting into system clipboard. The problem is addressed by using macro calls instead of function calls. There is no notable side effect.	4 years ago
Jan Hrastnik	8bccd6df30	applied changes from pr review	4 years ago
PabloMansanet	f7e00cf720	Configurable keys 2 (Mapping keys to commands) (#268 ) * Add convenience/clarity wrapper for Range initialization * Add keycode parse and display methods * Add remapping functions and tests * Implement key remapping * Add remapping book entry * Use raw string literal for toml * Add command constants * Make command functions private * Map directly to commands * Match key parsing/displaying to Kakoune * Formatting pass * Update documentation * Formatting * Fix example in the book * Refactor into single config file * Formatting * Refactor configuration and add keymap newtype wrappers * Address first batch of PR comments * Replace FromStr with custom deserialize	4 years ago
Jan Hrastnik	9c3eadb2e4	fixed some problems from rebasing	4 years ago
Jan Hrastnik	7cf0fa05a4	doc.line_ending() now returns &'static str	4 years ago
Jan Hrastnik	a4f5a0134e	trying out line ending helper functions in commands.rs	4 years ago
Jan Hrastnik	a9a718c3ca	added some tests and a line_ending helper function in document.rs	4 years ago
Jan Hrastnik	9c419fe05c	added more changes from pr review for line_ending_detection	4 years ago
Jan Hrastnik	5eb6918392	resolved conflict in rebase	4 years ago
Jan Hrastnik	17f69a03e0	ran cargo clippy and cargo fmt	4 years ago
Jan Hrastnik	3756c21bae	rebase on branch line_ending_detection	4 years ago
Gokul Soumya	d1c8a74771	Add theme key for selected line number Adds `ui.linenr.selected` which controls highlight of linu numbes which have cursors on. - Fallback to linenr if linenr.selected is missing - Update docs and themes - Add TODOs for themes with temporary linenr.selected	4 years ago
Ivan Tham	124514aa70	Add cursor kind to separate hidden cursor from pos Now IME cursor position should be correct since we can still set cursor position without drawing the cursor.	4 years ago
Benoît CORTIER	6bdf609caa	Remove RwLock for registers Registers are stored inside `Editor` and accessed without `RwLock`. To work around ownership, I added a sister method to `Editor::current`: `Editor::current_with_context`. I tried to modify `Editor::current` directly but it's used at a lot of places so I reverted into this for now at least.	4 years ago
Nathan Vegdahl	ecb39da3e0	Cosmetic changes and better comments for the indent auto-detect code.	4 years ago
Nathan Vegdahl	0a5580aa21	Address PR comments. - Move char functions into their own module under helix_core. - Use matches!() macro where appropriate. - Use a static lifetime on indent_unit() now that we can.	4 years ago
Nathan Vegdahl	8648e483f7	Render indent-style status in status line. Also cleaned up the status line code a little.	4 years ago
Nathan Vegdahl	5ca043c17a	Fix clippy warnings.	4 years ago
Nathan Vegdahl	2329512122	Attempt to auto-detect indentation style on document load. This also moves the primary indentation-style setting into Document.	4 years ago
dependabot[bot]	e4b3a666d2	Bump once_cell from 1.7.2 to 1.8.0 (#255 ) Bumps [once_cell](https://github.com/matklad/once_cell) from 1.7.2 to 1.8.0. - [Release notes](https://github.com/matklad/once_cell/releases) - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.7.2...v1.8.0) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>	4 years ago
dependabot[bot]	9b352ceefd	Bump crossterm from 0.19.0 to 0.20.0 Bumps [crossterm](https://github.com/crossterm-rs/crossterm) from 0.19.0 to 0.20.0. - [Release notes](https://github.com/crossterm-rs/crossterm/releases) - [Changelog](https://github.com/crossterm-rs/crossterm/blob/master/CHANGELOG.md) - [Commits](https://github.com/crossterm-rs/crossterm/compare/0.19...0.20) --- updated-dependencies: - dependency-name: crossterm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	4 years ago
Blaž Hrastnik	ae5ecfdf66	Release v0.2.0	4 years ago
Wojciech Kępka	d008e86037	`Document::is_modified` should not check if path is set If there is a new document we still want to know if there are unsaved changes	4 years ago
Robin	44cc0d8eb0	add alternate file (#223 ) * add alternate file inspired by vim ctrl-6/kak ga commands. the alternate file is kept per view * apply feedback from #223 * rename to last_accessed * add ga doc * add fail message for ga	4 years ago
Jakub Bartodziej	69fe46a122	Add :earlier and :later commands that can be used to navigate the full edit history. (#194 ) * Disable deleting from an empty buffer which can cause a crash. * Improve on the fix for deleting from the end of the buffer. * Clean up leftover log. * Avoid theoretical underflow. * Implement :before which accepts a time interval and moves the editor to the closest history state to the commit of the current time minus that interval. Current time is now by default, or the commit time if :before has just been used. * Add :earlier an :later commands that can move through the edit history and retrieve changes hidded by undoing and commiting new changes. The commands accept a number of steps or a time period relative to the currrent change. * Fix clippy lint error. * Remove the dependency on parse_duration, add a custom parser instead. * Fix clippy errors. * Make helix_core::history a public module. * Use the helper for getting the current document and view. * Handled some PR comments. * Fix the logic in :later n. Co-authored-by: Ivan Tham <pickfire@riseup.net> * Add an alias for :earlier. Co-authored-by: Ivan Tham <pickfire@riseup.net> * Add an alias for later. Co-authored-by: Ivan Tham <pickfire@riseup.net> * Run cargo fmt. * Add some tests for earlier and later. * Add more tests and restore the fix for later that diappeared somehow. * Use ? instead of a match on an option. Co-authored-by: Ivan Tham <pickfire@riseup.net> * Rename to UndoKind. * Remove the leftover match. * Handle a bunch of review comments. * More systemd.time compliant time units and additional description for the new commands. * A more concise rewrite of the time span parser using ideas from PR discussion. * Replace a match with map_err(). Co-authored-by: Ivan Tham <pickfire@riseup.net> Co-authored-by: Jakub Bartodziej <jqb@google.com> Co-authored-by: Ivan Tham <pickfire@riseup.net>	4 years ago
Wojciech Kępka	098806ce2a	lsp: Display LSP progress messages (#216 )	4 years ago
notoria	9887b1275a	Implement missing Debug and update Cargo.lock	4 years ago
Ivan Tham	7cc13fefe9	Derive debug without feature Note that this also removed those `finish_non_exhaustive()`.	4 years ago
notoria	1a3a924634	Implement Debug for data structure as a feature	4 years ago
Ivan Tham	6b3c9d8ed3	Fix jump behavior, goto_implementation now jump Better jump behavior since we override the first jump if it's on the first document. At the same time, ctrl-i is now working with gd jumps.	4 years ago
Kevin Sjöberg	7ef0e2cab6	Don't panic on empty document	4 years ago
Zheming Li	ae51065213	Support go to line 1	4 years ago
Kirawi	b873fb9897	Fix Unicode (#135 ) * init * wip * wip * fix unicode break * fix unicode break * Update helix-core/src/transaction.rs Co-authored-by: Benoît Cortier <benoit.cortier@fried-world.eu> * clippy * fix * add changes * added test * wip * wip * wip * wip * fix * fix view * fix #88 Co-authored-by: Benoît Cortier <benoit.cortier@fried-world.eu>	4 years ago
Ivan Tham	82fdfdc38e	Add missing newline to end of file on load Fix #152	4 years ago
Egor Karavaev	960bc9f134	Don't panic on LSP not starting	4 years ago
Benoît CORTIER	68affa3c59	Implement register selection User can select register to yank into with the " command. A new state is added to `Editor` and `commands::Context` structs. This state is managed by leveraging a new struct `RegisterSelection`.	4 years ago
Blaž Hrastnik	f48a60b8e2	Release 0.0.10	4 years ago
Ethan Bodzioney	843c2cdebd	Install instructions and version number corrections (#148 ) * Add MacOS install instructions * Change version name argument When using the -V command to get the version you are given 'helix-term x.x.x', I changed this to just helix as it makes more sense. * Fixed version number * Fixed version number * Fixed version number * Fixed version number * Fixed version number * Fixed version number	4 years ago
Wojciech Kępka	16b1cfa3be	Add diagnostics keybindings	4 years ago
Ingrid	54f3548d54	theme: Enable style modifiers in theme.toml, add Ingrid's theme (#113 ) * theme: Enable style modifiers in theme.toml * docs: theme documentation * fixup: parse modifiers with filter_map * theme: tests for parse_style * theme: Log invalid cases in theme.toml parse * docs: theme documentation fixup * docs: Blaz's theming comments * docs: Theme doc fixes from pickfire Co-authored-by: Ivan Tham <pickfire@riseup.net> * theme: More context in logs, TODO for alerting users * contrib: Ingrid's theme * docs: Theme subsection fixes Co-authored-by: Ivan Tham <pickfire@riseup.net>	4 years ago
Wojciech Kępka	bcb1afeb4c	Add a comment to `canonicalize_path`	4 years ago
Wojciech Kępka	de946d2357	Add a TODO	4 years ago
Wojciech Kępka	14f511da93	Create document if it doesn't exist on save	4 years ago
Kirawi	c17dcb8633	Fixing Multiple Panics (#121 ) * init * wip * wip	4 years ago
Blaž Hrastnik	06d8d3f55f	Try to detect language when document file path is set Fixes #91	4 years ago
Ivan Tham	e6132f0acd	Fix undo redo I missed the fast return. Fix #89	4 years ago
Jakub Bartodziej	3c5dfb0633	Improve on the fix for deleting from the end of the buffer.	4 years ago
Jakub Bartodziej	6cbc0aea92	Disable deleting from an empty buffer which can cause a crash.	4 years ago
Blaž Hrastnik	c0332bd935	Fix split sizes getting out of sync with the terminal size, refs #69	4 years ago
Rowan Herbert	1b67fae9f4	Fix panic when buffer larger than terminal width	4 years ago
Ivan Tham	f5f46b1fed	Separate document history into Cell As history is used separately from the rest of the edits, separating it can avoid needless borrowing and cloning. But one need to be aware later.	4 years ago
Blaž Hrastnik	ce25aa951e	Allow setting a filepath on :write	4 years ago
Blaž Hrastnik	2c48d65b15	Format document on save	4 years ago
Blaž Hrastnik	2100f5a2c0	Address clippy lint.	4 years ago
Blaž Hrastnik	8f6f329057	If switching to a previously open buffer in the same view, keep it's old offset	4 years ago
Blaž Hrastnik	4a9d1163e0	Hacky way to specify indent scopes per language via toml configs. Can't do it via a scm query nicely because it returns an iterator over all the matches, whereas we want to traverse the tree ourselves. Can't extract the pattern data from a parsed query either. Oh well, toml files for now.	4 years ago
Blaž Hrastnik	5cbb4efa6d	Add the LICENSE file.	4 years ago
Blaž Hrastnik	35606a3daa	Inline tui as helix-tui fork. We only rely on some of the rendering primitives and implement our Cursive-style compositor on top.	4 years ago
Blaž Hrastnik	c0a8b81487	Only send the document close event if we're closing the underlying buffer	4 years ago
Blaž Hrastnik	c20813690f	View::new is infallible, so is editor.switch/new_file.	4 years ago
Blaž Hrastnik	f2c79e245b	Allow switching views back to scratch buffers.	4 years ago
Blaž Hrastnik	418ee17b86	Canonicalize the path on open to avoid duplicates.	4 years ago
Blaž Hrastnik	7c915dc065	Add the :new command, don't crash if saving without filename.	4 years ago
Blaž Hrastnik	fd4fd12fa3	clippy lint	4 years ago
Blaž Hrastnik	d00414f81a	Start moving more LSP calls into callbacks/futures without capturing self	4 years ago
Blaž Hrastnik	1ad0581ddd	Eliminate a few more futures dependencies.	4 years ago
Blaž Hrastnik	355ad3cb82	Tokio migration.	4 years ago
Blaž Hrastnik	b6a22e955b	Closer to a full flake build via naersk. Blocked on https://github.com/NixOS/nix/issues/4423, build doesn't see submodules.	4 years ago
Blaž Hrastnik	b0bdcab970	doc: Note about diagnostic mapping.	4 years ago
Blaž Hrastnik	28c167d71d	doc: Be smarter about calculating modified status. This way edit -> undo will properly show up as unmodified.	4 years ago
Blaž Hrastnik	b5b650cfe7	Fix the last line calculation inside ensure_cursor_in_view	4 years ago
Blaž Hrastnik	3e5f24a9d5	lsp: support both utf-8 and utf-16 offsets. Still need to implement the clangd encoding negotiation, but it's a start. Should also manually override to utf8 for pyls.	4 years ago
Blaž Hrastnik	180521fefe	Adjust scroll() to match kakoune: only scroll the view if cursor in bounds.	4 years ago
Blaž Hrastnik	978f5114d8	Horizontal scrolling! It only took a year to get around to it.	4 years ago
Blaž Hrastnik	52da68e49a	Render a separator between vertical splits.	4 years ago
Blaž Hrastnik	9f318a8529	Fix an issue with closing nested splits. The parent id was never assigned to the split, so removing the container when it became empty failed.	4 years ago
Blaž Hrastnik	8b33ba2284	Correct the naming issue with vsplit and hsplit being swapped.	4 years ago

1 2 3 4 5 ...

409 Commits (757babb1b4390a7446a2a4f3efb1d9302961a1f6)