Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ jobs:
steps:
- name: Install build dependencies - Linux
if: ${{ runner.os == 'Linux' }}
run: sudo apt-get update && sudo 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
run: sudo apt-get update && sudo 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 libwayland-dev libwayland-client0 libxkbcommon-dev libxkbcommon-x11-dev libxkbcommon0 xkb-data

- name: Checkout the latest code
uses: actions/checkout@v5
Expand Down
4 changes: 2 additions & 2 deletions exports/atom.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const TextBuffer = require('text-buffer');
const TextBuffer = require('@pulsar-edit/text-buffer');
const { Point, Range } = TextBuffer;
const { File, Directory } = require('pathwatcher');
const { File, Directory } = require('@pulsar-edit/pathwatcher');
const { Emitter, Disposable, CompositeDisposable } = require('event-kit');
const BufferedNodeProcess = require('../src/buffered-node-process');
const BufferedProcess = require('../src/buffered-process');
Expand Down
30 changes: 12 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,19 @@
"@babel/core": "7.18.6",
"@electron/remote": "2.1.2",
"@formatjs/fast-memoize": "^2.2.6",
"@pulsar-edit/fuzzy-native": "https://github.com/pulsar-edit/fuzzy-native.git#670c97d95ac22e4ac54aa6ebda0f2e3d3716764a",
"@pulsar-edit/atom-keymap": "^9.0.2",
"@pulsar-edit/fuzzy-native": "1.3.0",
"@pulsar-edit/get-scrollbar-style": "^1.0.1",
"@pulsar-edit/git-utils": "^7.0.1",
"@pulsar-edit/pathwatcher": "^9.0.2",
"@pulsar-edit/scandal": "^4.0.0",
"@pulsar-edit/superstring": "^3.0.4",
"@pulsar-edit/text-buffer": "^14.0.3",
"about": "file:packages/about",
"archive-view": "file:packages/archive-view",
"async": "3.2.4",
"atom-dark-syntax": "file:packages/atom-dark-syntax",
"atom-dark-ui": "file:packages/atom-dark-ui",
"atom-keymap": "https://github.com/pulsar-edit/atom-keymap.git#0a6fc78",
"atom-light-syntax": "file:packages/atom-light-syntax",
"atom-light-ui": "file:packages/atom-light-ui",
"atom-select-list": "^0.8.1",
Expand Down Expand Up @@ -76,10 +82,8 @@
"fs-plus": "^3.1.1",
"fstream": "1.0.12",
"fuzzy-finder": "file:packages/fuzzy-finder",
"get-scrollbar-style": "https://github.com/pulsar-edit/get-scrollbar-style.git#9e8e2df",
"git-diff": "file:packages/git-diff",
"git-utils": "https://github.com/pulsar-edit/git-utils.git#f4e8c37",
"github": "https://github.com/savetheclocktower/github.git#812377e0d10ca58ea979746d9c7edc88cc28218f",
"github": "https://github.com/pulsar-edit/github#v0.37.0-pretranspiled",
"go-to-line": "file:packages/go-to-line",
"grammar-selector": "file:packages/grammar-selector",
"grim": "2.0.3",
Expand Down Expand Up @@ -150,12 +154,10 @@
"one-light-ui": "file:packages/one-light-ui",
"open-on-github": "file:packages/open-on-github",
"package-generator": "file:packages/package-generator",
"pathwatcher": "https://github.com/savetheclocktower/node-pathwatcher#d2281e60669644a4a8931f0b015d7c3792307327",
"postcss": "8.4.31",
"postcss-selector-parser": "6.0.4",
"pulsar-updater": "file:packages/pulsar-updater",
"resolve": "1.18.1",
"scandal": "https://github.com/pulsar-edit/scandal.git#176eee2",
"scoped-property-store": "^0.17.0",
"season": "^6.0.2",
"second-mate": "https://github.com/pulsar-edit/second-mate.git#9686771",
Expand All @@ -169,17 +171,15 @@
"spell-check": "file:packages/spell-check",
"status-bar": "file:packages/status-bar",
"styleguide": "file:./packages/styleguide",
"superstring": "github:savetheclocktower/superstring#e5e848017f7a28fe250b45f8c7f8ed244371d33d",
"symbol-provider-ctags": "file:./packages/symbol-provider-ctags",
"symbol-provider-tree-sitter": "file:./packages/symbol-provider-tree-sitter",
"symbols-view": "file:./packages/symbols-view",
"tabs": "file:packages/tabs",
"temp": "0.9.4",
"text-buffer": "https://github.com/savetheclocktower/text-buffer#e7a465163bd94db8fb11204c44bcd9bcceba07a8",
"timecop": "file:./packages/timecop",
"tree-view": "file:./packages/tree-view",
"typescript": "^5.8.3",
"typescript-simple": "github:savetheclocktower/typescript-simple#d4aa28d4a4f160dca91acd084eb99fb262a7c708",
"typescript-simple": "github:savetheclocktower/typescript-simple#fd2829fd19386599377079978ff8d0a22d577897",
"underscore-plus": "^1.7.0",
"update-package-dependencies": "file:./packages/update-package-dependencies",
"vscode-ripgrep": "1.9.0",
Expand Down Expand Up @@ -319,13 +319,7 @@
"keytar": "7.9.0",
"nan": "2.19.0",
"ctags": "https://github.com/pulsar-edit/node-ctags.git#c32ca6017dd3f4ea314d53b044225505820abbe3",
"**/superstring": "github:savetheclocktower/superstring#e5e848017f7a28fe250b45f8c7f8ed244371d33d",
"superstring": "github:savetheclocktower/superstring#e5e848017f7a28fe250b45f8c7f8ed244371d33d",
"**/pathwatcher": "https://github.com/savetheclocktower/node-pathwatcher#d2281e60669644a4a8931f0b015d7c3792307327",
"pathwatcher": "https://github.com/savetheclocktower/node-pathwatcher#d2281e60669644a4a8931f0b015d7c3792307327",
"es5-ext": "https://github.com/pulsar-edit/es5-ext#169f6ae9b2675675269a0ba265f83c29c7b56244",
"@electron/remote": "2.1.2",
"**/keyboard-layout": "https://github.com/savetheclocktower/keyboard-layout#e3dd9aacba1bdb085de412092f394f949595f805",
"keyboard-layout": "https://github.com/savetheclocktower/keyboard-layout#e3dd9aacba1bdb085de412092f394f949595f805"
"@electron/remote": "2.1.2"
}
}
}
2 changes: 1 addition & 1 deletion spec/git-repository-provider-spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');
const fs = require('fs-plus');
const temp = require('temp').track();
const { Directory } = require('pathwatcher');
const { Directory } = require('@pulsar-edit/pathwatcher');
const GitRepository = require('../src/git-repository');
const GitRepositoryProvider = require('../src/git-repository-provider');

Expand Down
2 changes: 1 addition & 1 deletion spec/grammar-registry-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const dedent = require('dedent');
const path = require('path');
const fs = require('fs-plus');
const temp = require('temp').track();
const TextBuffer = require('text-buffer');
const TextBuffer = require('@pulsar-edit/text-buffer');
const GrammarRegistry = require('../src/grammar-registry');
const WASMTreeSitterGrammar = require('../src/wasm-tree-sitter-grammar');
const SecondMate = require('second-mate');
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/jasmine1-spec-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const path = require('path');
const _ = require('underscore-plus');
const fs = require('fs-plus');
const Grim = require('grim');
const pathwatcher = require('pathwatcher');
const pathwatcher = require('@pulsar-edit/pathwatcher');
const FindParentDir = require('find-parent-dir');
const {CompositeDisposable} = require('event-kit');

Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/jasmine2-spies.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const FindParentDir = require("find-parent-dir");
const path = require("path");
const _ = require("underscore-plus");
const TextEditorElement = require("../../src/text-editor-element");
const pathwatcher = require("pathwatcher");
const pathwatcher = require("@pulsar-edit/pathwatcher");
const TextEditor = require("../../src/text-editor");
const TextMateLanguageMode = require("../../src/text-mate-language-mode");
const {CompositeDisposable} = require("event-kit");
Expand Down
2 changes: 1 addition & 1 deletion spec/helpers/random.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const WORDS = require('./words');
const { Point, Range } = require('text-buffer');
const { Point, Range } = require('@pulsar-edit/text-buffer');

exports.getRandomBufferRange = function getRandomBufferRange(random, buffer) {
const endRow = random(buffer.getLineCount());
Expand Down
10 changes: 5 additions & 5 deletions spec/helpers/warnings.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
const pathwatcher = require("pathwatcher");
const pathwatcher = require("@pulsar-edit/pathwatcher");
const _ = require("underscore-plus");
const Grim = require("grim");

exports.warnIfLeakingPathSubscriptions = function() {
exports.warnIfLeakingPathSubscriptions = function () {
const watchedPaths = pathwatcher.getWatchedPaths();
if (watchedPaths.length > 0) {
console.error("WARNING: Leaking subscriptions for paths: " + watchedPaths.join(", "));
}
return pathwatcher.closeAllWatchers();
};

exports.ensureNoDeprecatedFunctionCalls = function() {
exports.ensureNoDeprecatedFunctionCalls = function () {
const deprecations = _.clone(Grim.getDeprecations());
Grim.clearDeprecations();
if (deprecations.length > 0) {
const originalPrepareStackTrace = Error.prepareStackTrace;
Error.prepareStackTrace = function(error, stack) {
Error.prepareStackTrace = function (error, stack) {
const output = [];
for (let deprecation of Array.from(deprecations)) {
output.push(`${deprecation.originName} is deprecated. ${deprecation.message}`);
Expand All @@ -37,7 +37,7 @@ exports.ensureNoDeprecatedFunctionCalls = function() {
}
};

exports.ensureNoDeprecatedStylesheets = function() {
exports.ensureNoDeprecatedStylesheets = function () {
const deprecations = _.clone(atom.styles.getDeprecations());
atom.styles.clearDeprecations();
return (() => {
Expand Down
2 changes: 1 addition & 1 deletion spec/path-watcher-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const fs = require('fs-plus');
const path = require('path');
const { promisify } = require('util');
const { File, Directory } = require('atom');
const { closeAllWatchers } = require('pathwatcher');
const { closeAllWatchers } = require('@pulsar-edit/pathwatcher');
const { sep } = path;

const { CompositeDisposable } = require('event-kit');
Expand Down
4 changes: 2 additions & 2 deletions spec/project-spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const temp = require('temp').track();
const TextBuffer = require('text-buffer');
const TextBuffer = require('@pulsar-edit/text-buffer');
const Project = require('../src/project');
const fs = require('fs-plus');
const path = require('path');
const { Directory } = require('pathwatcher');
const { Directory } = require('@pulsar-edit/pathwatcher');
const { stopAllWatchers } = require('../src/path-watcher');
const GitRepository = require('../src/git-repository');

Expand Down
2 changes: 1 addition & 1 deletion spec/scope-resolver-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const fs = require('fs');
const Grim = require('grim');
const path = require('path');
const dedent = require('dedent');
const TextBuffer = require('text-buffer');
const TextBuffer = require('@pulsar-edit/text-buffer');
const { Point, Range } = TextBuffer;
const CSON = require('season');
const TextEditor = require('../src/text-editor');
Expand Down
2 changes: 1 addition & 1 deletion spec/text-editor-component-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const TextEditorComponent = require('../src/text-editor-component');
const TextEditorElement = require('../src/text-editor-element');
const TextEditor = require('../src/text-editor');
const ViewRegistry = require('../src/view-registry');
const TextBuffer = require('text-buffer');
const TextBuffer = require('@pulsar-edit/text-buffer');
const { Point } = TextBuffer;
const fs = require('fs');
const path = require('path');
Expand Down
Loading
Loading