Merge back master into updated-latest-electron

.cirrus.yml

@@ -87,11 +87,35 @@ arm_linux_task:
                 libnss3
                 wget
                 xvfb
+                libncursesw5-dev
+                libssl-dev
+                libsqlite3-dev
+                tk-dev
+                libgdbm-dev
+                libc6-dev
+                libbz2-dev
+                libffi-dev
+                zlib1g-dev
     - gem install dotenv -v '~>  2.8'
     - gem install fpm
     - git submodule init
     - git submodule update
     - sed -i -e "s/[0-9]*-dev/`date -u +%Y%m%d%H`-next/g" package.json
+  python_fetch_and_build_cache:
+    fingerprint_script: echo "${CIRRUS_OS}-$(uname -prsv)-Python-${PYTHON_VERSION}.9"
+    folder: Python-${PYTHON_VERSION}.9
+    populate_script:
+      - wget "https://www.python.org/ftp/python/${PYTHON_VERSION}.9/Python-${PYTHON_VERSION}.9.tgz"
+      - echo "45313e4c5f0e8acdec9580161d565cf5fea578e3eabf25df7cc6355bf4afa1ee  Python-${PYTHON_VERSION}.9.tgz" | sha256sum --check
+      - tar xzf "Python-${PYTHON_VERSION}.9.tgz"
+      - cd "Python-${PYTHON_VERSION}.9"
+      - ./configure --enable-optimizations
+      - make
+  upload_caches:
+    - python_fetch_and_build
+  install_python_script:
+    - cd "Python-${PYTHON_VERSION}.9" && make install
+    - python3 -m pip install setuptools
   install_script:
     - yarn install --ignore-engines || yarn install --ignore-engines
   build_script:
@@ -135,7 +159,7 @@ silicon_mac_task:
     APPLEID: ENCRYPTED[549ce052bd5666dba5245f4180bf93b74ed206fe5e6e7c8f67a8596d3767c1f682b84e347b326ac318c62a07c8844a57]
     APPLEID_PASSWORD: ENCRYPTED[774c3307fd3b62660ecf5beb8537a24498c76e8d90d7f28e5bc816742fd8954a34ffed13f9aa2d1faf66ce08b4496e6f]
     TEAM_ID: ENCRYPTED[11f3fedfbaf4aff1859bf6c105f0437ace23d84f5420a2c1cea884fbfa43b115b7834a463516d50cb276d4c4d9128b49]
-    ROLLING_UPLOAD_TOKEN: ENCRYPTED[41b279482c1b61c9129e410233cc5cd71bbfd60e33d03cefae451aff6bc9915d1706a6e8fefd0e0f9041a4bd287c84be] # <-- This is the Electron Next Bins token! Careful when resolving merge conflicts to not overrite to/from master. master branch keeps its token, updated-latest-electron branch keeps this one!
+    ROLLING_UPLOAD_TOKEN: ENCRYPTED[9cfac7b7c2b28c0979ddd587f7cda3ed1bbe893bbf7ec1d8df9808ef24cdb53c17c1edc572ee249d83c65529cea18a30]
   prepare_script:
     - brew update
     - brew uninstall node@20

.github/workflows/build.yml

@@ -38,8 +38,8 @@ jobs:
     steps:
     - name: Install build dependencies - Linux
       if: ${{ runner.os == 'Linux' }}
-      run: apt-get update && apt-get install -y git python3 python3-pip make gcc g++ libx11-dev libxkbfile-dev pkg-config libsecret-1-dev rpm xvfb ffmpeg zstd wget squashfs-tools
-       libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev zlib1g-dev # <-- Python-related stuff on this line
+      run: apt-get update && apt-get install -y git make gcc g++ libx11-dev libxkbfile-dev pkg-config libsecret-1-dev rpm xvfb ffmpeg zstd wget squashfs-tools
+        libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev libffi-dev zlib1g-dev # <-- Python-related stuff on this line
 
     - name: Restore Compiled Python from Cache - Linux
       if: ${{ runner.os == 'Linux' }}

CHANGELOG.md

@@ -10,6 +10,18 @@
 
 - Added a Jasmine 2-based test runner, migrated core editor tests to use it. Packages bundled into the core editor can migrate their tests to use this as well, over time. The Jasmine 1 test runner remains available.
 - Adding `--enable-features=UseOzonePlatform` and `--ozone-platform=wayland` as parameters when running under Wayland on Linux (avoids using xwayland, which causes rendering problems on some systems, especially with NVidia)
+## 1.127.1
+
+- Hotfix: Reverted a Wayland-related change that Linux users reported issues with on Electron 12.
+
+### Pulsar
+
+- Revert "Wayland pulsar script" [@mauricioszabo](https://github.com/pulsar-edit/pulsar/pull/1261)
+
+## 1.127.0
+
+- Added a Jasmine 2-based test runner, migrated core editor tests to use it. Packages bundled into the core editor can migrate their tests to use this as well, over time. The Jasmine 1 test runner remains available.
+- Added `--enable-features=UseOzonePlatform` and `--ozone-platform=wayland` as parameters when running under Wayland on Linux (avoids using xwayland, which causes rendering problems on some systems, especially with NVidia)
 - Many Tree-sitter/parser/grammar improvements.
   - Updated to `web-tree-sitter` version `0.25.3`.
   - Fixed a bug preventing folds from updating after code changes in some scenarios.

docs/Pulsar-API-Documentation.md

@@ -196,7 +196,7 @@ style: Exclusively used for the <code>style</code> attribute</p>
 <dt><a href="#renderMarkdown">renderMarkdown(content, givenOpts)</a> ⇒ <code>string</code></dt>
 <dd><p>Takes a Markdown document and renders it as HTML.</p>
 </dd>
-<dt><a href="#beforeEach">beforeEach()</a></dt>
+<dt><a href="#conditionPromise">conditionPromise()</a></dt>
 <dd></dd>
 <dt><a href="#beforeEach">beforeEach()</a></dt>
 <dd></dd>
@@ -631,9 +631,9 @@ This file aims to run some short simple tests against `update.js`. Focusing
 ## path
 **Kind**: global constant  
 **Babel**:   
-<a name="beforeEach"></a>
+<a name="conditionPromise"></a>
 
-## beforeEach()
+## conditionPromise()
 **Kind**: global function  
 **Babel**:   
 <a name="beforeEach"></a>

docs/Source-Code-Documentation.md

@@ -196,7 +196,7 @@ style: Exclusively used for the <code>style</code> attribute</p>
 <dt><a href="#renderMarkdown">renderMarkdown(content, givenOpts)</a> ⇒ <code>string</code></dt>
 <dd><p>Takes a Markdown document and renders it as HTML.</p>
 </dd>
-<dt><a href="#beforeEach">beforeEach()</a></dt>
+<dt><a href="#conditionPromise">conditionPromise()</a></dt>
 <dd></dd>
 <dt><a href="#beforeEach">beforeEach()</a></dt>
 <dd></dd>
@@ -639,9 +639,9 @@ This file aims to run some short simple tests against `update.js`. Focusing
 ## path
 **Kind**: global constant  
 **Babel**:   
-<a name="beforeEach"></a>
+<a name="conditionPromise"></a>
 
-## beforeEach()
+## conditionPromise()
 **Kind**: global function  
 **Babel**:   
 <a name="beforeEach"></a>

package.json

@@ -2,7 +2,7 @@
   "name": "pulsar",
   "author": "Pulsar-Edit <[email protected]>",
   "productName": "Pulsar",
-  "version": "1.127.0-dev",
+  "version": "1.127.1-dev",
   "description": "A Community-led Hyper-Hackable Text Editor",
   "branding": {
     "id": "pulsar",

packages/language-python/package.json

@@ -14,6 +14,7 @@
   "license": "MIT",
   "atomTestRunner": "runners/jasmine2-test-runner",
   "dependencies": {
+    "tree-sitter-python": "0.19.0"
   },
   "consumedServices": {
     "hyperlink.injection": {

packages/welcome/lib/changelog-view.js

@@ -49,11 +49,14 @@ export default class ChangeLogView {
             <p>Take a look at some of the awesome things {atom.branding.name} has changed:</p>
             <p>Feel free to read our <a href="https://github.com/pulsar-edit/pulsar/blob/master/CHANGELOG.md">Full Change Log</a>.</p>
             <ul>
+              <li>
+                Pulsar v1.127.1 Hotfix: Reverted a Wayland-related change that Linux users reported issues with on Electron 12. (The remaining changes listed below are from Pulsar v1.127.0.)
+              </li>
               <li>
                 Added a Jasmine 2-based test runner, migrated core editor tests to use it. Packages bundled into the core editor can migrate their tests to use this as well, over time. The Jasmine 1 test runner remains available.
               </li>
               <li>
-                Adding <code>--enable-features=UseOzonePlatform</code> and <code>--ozone-platform=wayland</code> as parameters when running under Wayland on Linux (avoids using xwayland, which causes rendering problems on some systems, especially with NVidia)
+                Added <code>--enable-features=UseOzonePlatform</code> and <code>--ozone-platform=wayland</code> as parameters when running under Wayland on Linux (avoids using xwayland, which causes rendering problems on some systems, especially with NVidia)
               </li>
               <li>
                 Many Tree-sitter/parser/grammar improvements.

spec/helpers/jasmine2-spies.js

@@ -50,14 +50,8 @@ exports.register = (jasmineEnv) => {
     atom.config.set("editor.fontFamily", "Courier");
     atom.config.set("editor.fontSize", 16);
     atom.config.set("editor.autoIndent", false);
-    atom.config.set(
-      "core.disabledPackages",
-      [
-        "package-that-throws-an-exception",
-        "package-with-broken-package-json",
-        "package-with-broken-keymap"
-      ]
-    );
+    atom.config.set("core.disabledPackages", ["package-that-throws-an-exception",
+      "package-with-broken-package-json", "package-with-broken-keymap"]);
 
     // advanceClock(1000);
     // window.setTimeout.calls.reset();
@@ -98,6 +92,6 @@ exports.register = (jasmineEnv) => {
   });
 }
 
-jasmine.unspy = function (object, methodName) {
+jasmine.unspy = function(object, methodName) {
   object[methodName].and.callThrough();
 };

spec/package-manager-spec.js

@@ -1729,7 +1729,6 @@ describe('PackageManager', () => {
     });
 
     it('sets hasActivatedInitialPackages', async () => {
-      jasmine.useRealClock();
       spyOn(atom.styles, 'getUserStyleSheetPath').and.returnValue(null);
       spyOn(atom.packages, 'activatePackages');
       expect(atom.packages.hasActivatedInitialPackages()).toBe(false);

spec/package-spec.js

@@ -99,9 +99,10 @@ describe('Package', function () {
 
     afterEach(() => (atom.packages.devMode = true));
 
-    it('returns a promise resolving to the results of `apm rebuild`', async () => {
-      const packagePath = atom.project.getDirectories()?.[0]?.resolve('packages/package-with-index')
-
+    it('returns a promise resolving to the results of `apm rebuild`', async function() {
+      const packagePath = __guard__(atom.project.getDirectories()[0], x =>
+        x.resolve('packages/package-with-index')
+      );
       const pack = buildPackage(packagePath);
       const rebuildCallbacks = [];
       spyOn(pack, 'runRebuildProcess').and.callFake(callback =>
@@ -154,7 +155,7 @@ describe('Package', function () {
     });
   });
 
-  describe('theme', function () {
+  describe('theme', function() {
     let editorElement, theme;
 
     beforeEach(function () {
@@ -239,7 +240,7 @@ describe('Package', function () {
         theme.activate();
       });
 
-      it('deactivated event fires on .deactivate()', async function () {
+      it('deactivated event fires on .deactivate()', async function() {
         let spy = jasmine.createSpy();
         theme.onDidDeactivate(spy);
         await theme.deactivate();

spec/runners/jasmine2-test-runner.js

@@ -96,20 +96,11 @@ const defineJasmineHelpersOnWindow = (jasmineEnv) => {
   ['it', 'fit', 'xit'].forEach((key) => {
     window[key] = (name, originalFn) => {
       jasmineEnv[key](name, async (done) => {
-        try {
-          if (originalFn.length === 0) {
-              await originalFn();
-            done();
-          } else {
-            originalFn(done);
-          }
-        } catch (err) {
-          if (typeof err === 'string' && err.includes('Pending')) {
-            // A test marked itself as pending. Swallow the exception and
-            // proceed.
-            return;
-          }
-          throw err;
+        if(originalFn.length === 0) {
+          await originalFn()
+          done();
+        } else {
+          originalFn(done);
         }
       });
     }
@@ -118,7 +109,7 @@ const defineJasmineHelpersOnWindow = (jasmineEnv) => {
   ['beforeEach', 'afterEach'].forEach((key) => {
     window[key] = (originalFn) => {
       jasmineEnv[key](async (done) => {
-        if (originalFn.length === 0) {
+        if(originalFn.length === 0) {
           await originalFn()
           done();
         } else {

spec/text-editor-component-spec.js

@@ -29,7 +29,7 @@ let verticalScrollbarWidth, horizontalScrollbarHeight;
 
 describe('TextEditorComponent', () => {
   beforeEach(() => {
-    if (!window.customElements.get('text-editor-component-test-element')) {
+    if(!window.customElements.get('text-editor-component-test-element')) {
       window.customElements.define(
         'text-editor-component-test-element',
         DummyElement
@@ -3592,74 +3592,33 @@ describe('TextEditorComponent', () => {
     });
 
     it('does not attempt to render block decorations located outside the visible range', async () => {
-      // Build a text editor with only two rows per tile.
-      const { editor, element, component } = buildComponent({
+      const { editor, component } = buildComponent({
         autoHeight: false,
         rowsPerTile: 2
       });
-
-      // Set `line-height` to an integer to save us headaches later. (We
-      // believe that Chromium used to guarantee fixed increments of line
-      // height, but doesn't anymore — so we must specify it as an integer
-      // value ourselves if we want the math to be simpler.)
-      element.style.lineHeight = '20px';
-      component.measureCharacterDimensions();
-
-      // Make the editor tall enough to fit only two lines at a time.
       await setEditorHeightInLines(component, 2);
-
       expect(component.getRenderedStartRow()).toBe(0);
-
-      // This suggests one extra tile is rendered below the viewport just out
-      // of view. (But why is this `4` rather than `3`, since we're
-      // zero-indexed? This seems like a mistake in `getRenderedEndRow` logic.)
       expect(component.getRenderedEndRow()).toBe(4);
 
-      // Create a marker spanning the fourth and fifth rows…
       const marker1 = editor.markScreenRange([[3, 0], [5, 0]], {
         reversed: false
       });
-
-      // …and decorate it with a DIV.
       const item1 = document.createElement('div');
       editor.decorateMarker(marker1, { type: 'block', item: item1 });
 
-      // Repeat, but with the marker reversed.
       const marker2 = editor.markScreenRange([[3, 0], [5, 0]], {
         reversed: true
       });
       const item2 = document.createElement('div');
       editor.decorateMarker(marker2, { type: 'block', item: item2 });
 
       await component.getNextUpdatePromise();
-
-      // We do not expect the first block decoration to be rendered; its head
-      // is outside the renderered range.
       expect(item1.parentElement).toBeNull();
-
-      // But we expect the second decoration to be present because its head
-      // _is_ within the rendered range. (Remember that a “reversed” marker has
-      // its head _before_ its tail, but a non-reversed marker starts with its
-      // tail and ends with its head. Read the text-buffer docs for `Marker`
-      // for further understanding.)
-      //
-      // This comment does not imply understanding of the reasoning behind
-      // this — just that this is the relevant difference in behavior between
-      // the two decorations.
       expect(item2.nextSibling).toBe(lineNodeForScreenRow(component, 3));
 
-      // Scroll down so that the fifth line is the first one visible.
       await setScrollTop(component, 4 * component.getLineHeight());
-
-      // Again, lines 4-5-6-7 (zero-indexed) are understood to be visible, but
-      // `getRenderedEndRow` will report an end row of `8`, which is its own
-      // quirk.
       expect(component.getRenderedStartRow()).toBe(4);
       expect(component.getRenderedEndRow()).toBe(8);
-
-      // Now the logic is reversed; the rendered range includes the head of
-      // the first decoration, but not of the second decoration. Hence the
-      // first decoration is renderered and the second isn't.
       expect(item1.nextSibling).toBe(lineNodeForScreenRow(component, 5));
       expect(item2.parentElement).toBeNull();
     });
@@ -5649,9 +5608,6 @@ describe('TextEditorComponent', () => {
         rowsPerTile: 1,
         autoHeight: false
       });
-      // Set the initial line height to match that of the editor font size.
-      element.style.lineHeight = Math.ceil(parseFloat(getComputedStyle(element).fontSize)) + 'px'
-      component.measureCharacterDimensions();
       await setEditorHeightInLines(component, 3);
       await setEditorWidthInCharacters(component, 20);
       component.setScrollTopRow(4);
@@ -6035,8 +5991,6 @@ describe('TextEditorComponent', () => {
         rowsPerTile: 3,
         autoHeight: false
       });
-      element.style.lineHeight = '20px';
-      component.measureCharacterDimensions();
       element.style.height =
         4 * component.measurements.lineHeight +
         horizontalScrollbarHeight +