mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-10-26 11:08:40 +03:00
46877b05ff
…to each PHP section in order to match the functionality of the TextMate grammar. This was a gigantic endeavor and involved doing several things that were on my “ugh, I’ll get around to it” list: * To make some of this stuff work, we were using two different PHP parser layers. The root one did the syntax highlighting and separated the HTML from the rest, and the deeper injection was there just so we could scope some ranges as `source.php`. That doesn’t work because of rules we have about shallower layers acting before deeper layers when iterating through syntax highlighting boundaries. I was trying to be too clever. Now the _root_ layer is the one that does no highlighting, and the _deeper_ layer is the one that exists to apply `source.php` _and then_ perform highlighting and indentation hinting and folding and whatnot. If we need to, we can move some of the queries to the root layer for whatever reason; maybe we come across a bug six months from now that could be fixed if we made the root layer in charge of folding. We have options. * All boundaries for `HighlightIterator`s now _either_ open one or more scopes _or_ close one or more scopes. If one boundary can close some scopes and open others, then boundaries on different layers that share a buffer position cannot possibly close/open in the correct order because they can't intermingle. This needed to happen and this was as good of an excuse as any to do it. * We needed to present sane PHP opening/closing ranges to the injection. Ironically, `tree-sitter-php` itself makes this nearly impossible because of how the tree is structured; it tries to hide the `<?php` and `?>` tags from the PHP layer and treat them as text, despite the fact that PHP is the thing that knows how to parse that. The best way to do this — at least until I encounter a reason why it can’t work — is to find all the `<?php`s and `?>`s, sort them, group them, and build fake node ranges. This is fine! I mean, it’s ridiculous, but it’s fine! The ranges that we hand off to another parser are allowed to be completely arbitrary! This lets us do what we were only approximating before: have _one_ PHP injection layer with _any number of_ content ranges, each of which begins with `<?php` and ends with `?>` without trying to claim any surrounding whitespace. This would be worth it even if we didn’t have to do any of this other stuff. * Each content range of the injection needs _either_ `meta.embedded.line.php` _or_ `meta.embedded.block.php` depending on whether the range begins and ends on the same line. This is not something I was willing to regress on because it's _hard_ to distinguish between PHP and non-PHP unless your editor helps you out, and because I wasn't going to go into a bunch of themes and tell them to treat `source.php` like `meta.embedded`. This also meant that we needed to be able to add _multiple_ “root” scope names per content range. But we already had a mode in which the `languageScope` injection option could be a callback, so it wasn't hard to make it a callback that could take extra parameters for the buffer and range. This isn't a feature that I'm eager for other grammars to use, or even necessarily know about, but it was what we needed to deliver feature parity here. And none of it would have been necessary if `tree-sitter-php` made more sensible choices. (Whatever. Maybe what I want isn't possible for some strange reason.) All existing tests pass. Tests have been written for the new `languageScope` features. Tests need to be written for PHP just like for all other language grammars, but that was on the to-do list anyway. If any of this turns out to be catastrophic, it’s easy to roll back, but tests are passing on my machine and I expect them to pass in CI. |
||
|---|---|---|
| .. | ||
| fixtures | ||
| helpers | ||
| main-process | ||
| .eslintrc.js | ||
| application-delegate-spec.js | ||
| async-spec-helpers.js | ||
| atom-environment-spec.js | ||
| atom-paths-spec.js | ||
| atom-protocol-handler-spec.js | ||
| atom-reporter.js | ||
| babel-spec.js | ||
| buffered-node-process-spec.js | ||
| buffered-process-spec.js | ||
| clipboard-spec.js | ||
| command-installer-spec.js | ||
| command-registry-spec.js | ||
| compile-cache-spec.js | ||
| config-file-spec.js | ||
| config-spec.js | ||
| context-menu-manager-spec.js | ||
| decoration-manager-spec.js | ||
| default-directory-provider-spec.js | ||
| default-directory-searcher-spec.js | ||
| deserializer-manager-spec.js | ||
| dock-spec.js | ||
| file-system-blob-store-spec.js | ||
| git-repository-provider-spec.js | ||
| git-repository-spec.js | ||
| grammar-registry-spec.js | ||
| gutter-container-spec.js | ||
| gutter-spec.js | ||
| history-manager-spec.js | ||
| jasmine-junit-reporter.js | ||
| jasmine-list-reporter.js | ||
| jasmine-test-runner.js | ||
| keymap-extensions-spec.js | ||
| menu-manager-spec.js | ||
| menu-sort-helpers-spec.js | ||
| module-cache-spec.js | ||
| native-compile-cache-spec.js | ||
| native-watcher-registry-spec.js | ||
| notification-manager-spec.js | ||
| notification-spec.js | ||
| package-manager-spec.js | ||
| package-spec.js | ||
| package-transpilation-registry-spec.js | ||
| pane-axis-element-spec.js | ||
| pane-container-element-spec.js | ||
| pane-container-spec.js | ||
| pane-element-spec.js | ||
| pane-spec.js | ||
| panel-container-element-spec.js | ||
| panel-container-spec.js | ||
| panel-spec.js | ||
| path-watcher-spec.js | ||
| project-spec.js | ||
| reopen-project-menu-manager-spec.js | ||
| scope-resolver-spec.js | ||
| selection-spec.js | ||
| spec-helper-functions.js | ||
| spec-helper-platform.js | ||
| spec-helper.js | ||
| state-store-spec.js | ||
| style-manager-spec.js | ||
| styles-element-spec.js | ||
| syntax-scope-map-spec.js | ||
| task-spec.js | ||
| text-editor-component-spec.js | ||
| text-editor-element-spec.js | ||
| text-editor-registry-spec.js | ||
| text-editor-spec.js | ||
| text-mate-language-mode-spec.js | ||
| text-utils-spec.js | ||
| theme-manager-spec.js | ||
| title-bar-spec.js | ||
| tooltip-manager-spec.js | ||
| tree-indenter-spec.js | ||
| tree-sitter-language-mode-spec.js | ||
| typescript-spec.js | ||
| ui-spec.js | ||
| update-process-env-spec.js | ||
| uri-handler-registry-spec.js | ||
| view-registry-spec.js | ||
| wasm-tree-sitter-language-mode-spec.js | ||
| window-event-handler-spec.js | ||
| workspace-center-spec.js | ||
| workspace-element-spec.js | ||
| workspace-spec.js | ||