Skip to content

Fix vscode/electron crash #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix vscode/electron crash #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c811ecb
it works
selfint Jun 16, 2023
eeed6c3
preserve old code
selfint Jun 16, 2023
5604230
fix bad copy paste
selfint Jun 18, 2023
52dfdfe
remove unneeded cast
selfint Jun 18, 2023
cf9473e
fix vscode crash
selfint Jun 18, 2023
a208ee3
remove unneeded cast
selfint Jun 18, 2023
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
10 changes: 7 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,8 @@ function getTextFromTextBuffer ({startPosition, endPosition}) {
return this.input.getTextInRange({start: startPosition, end: endPosition});
}

const {pointTransferArray} = binding;
let {pointTransferArray} = binding;
pointTransferArray = new Uint32Array(pointTransferArray.buffer);

const NODE_FIELD_COUNT = 6;
const ERROR_TYPE_ID = 0xFFFF
Expand All @@ -635,7 +636,9 @@ function unmarshalNode(value, tree, offset = 0, cache = null) {
? SyntaxNode
: tree.language.nodeSubclasses[nodeTypeId];

const {nodeTransferArray} = binding;
let {nodeTransferArray} = binding;
nodeTransferArray = new Uint32Array(nodeTransferArray.buffer);

const id = getID(nodeTransferArray, offset)
if (id === 0n) {
return null
Expand Down Expand Up @@ -676,7 +679,8 @@ function unmarshalNodes(nodes, tree) {
}

function marshalNode(node) {
const {nodeTransferArray} = binding;
let {nodeTransferArray} = binding;
nodeTransferArray = new Uint32Array(nodeTransferArray.buffer);
for (let i = 0; i < NODE_FIELD_COUNT; i++) {
nodeTransferArray[i] = node[i];
}
Expand Down
10 changes: 5 additions & 5 deletions src/conversions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ void InitConversions(Local<Object> exports) {

point_transfer_buffer = static_cast<uint32_t *>(malloc(2 * sizeof(uint32_t)));

#if _MSC_VER && NODE_RUNTIME_ELECTRON && NODE_MODULE_VERSION >= 89
#if /*_MSC_VER && NODE_RUNTIME_ELECTRON && */ NODE_MODULE_VERSION >= 89
// this is a terrible thing we have to do because of https://github.com/electron/electron/issues/29893
v8::Local<v8::Object> bufferView;
bufferView = node::Buffer::New(Isolate::GetCurrent(), point_transfer_buffer, 0, 2 * sizeof(uint32_t)).ToLocalChecked();
auto js_point_transfer_buffer = node::Buffer::Data(bufferView);
bufferView = node::Buffer::New(Isolate::GetCurrent(), (char *) point_transfer_buffer, (2 * sizeof(uint32_t))).ToLocalChecked();
Nan::Set(exports, Nan::New("pointTransferArray").ToLocalChecked(), bufferView);
#elif (V8_MAJOR_VERSION > 8 || (V8_MAJOR_VERSION == 8 && V8_MINOR_VERION > 3))
auto backing_store = ArrayBuffer::NewBackingStore(point_transfer_buffer, 2 * sizeof(uint32_t), BackingStore::EmptyDeleter, nullptr);
auto js_point_transfer_buffer = ArrayBuffer::New(Isolate::GetCurrent(), std::move(backing_store));
Nan::Set(exports, Nan::New("pointTransferArray").ToLocalChecked(), Uint32Array::New(js_point_transfer_buffer, 0, 2));
#else
auto js_point_transfer_buffer = ArrayBuffer::New(Isolate::GetCurrent(), point_transfer_buffer, 2 * sizeof(uint32_t));
Nan::Set(exports, Nan::New("pointTransferArray").ToLocalChecked(), Uint32Array::New(js_point_transfer_buffer, 0, 2));
#endif

Nan::Set(exports, Nan::New("pointTransferArray").ToLocalChecked(), Uint32Array::New(js_point_transfer_buffer, 0, 2));
}

void TransferPoint(const TSPoint &point) {
Expand Down
20 changes: 11 additions & 9 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,20 @@ static inline void setup_transfer_buffer(uint32_t node_count) {
transfer_buffer_length = new_length;
transfer_buffer = static_cast<uint32_t *>(malloc(transfer_buffer_length * sizeof(uint32_t)));

#if _MSC_VER && NODE_RUNTIME_ELECTRON && NODE_MODULE_VERSION >= 89
#if /*_MSC_VER && NODE_RUNTIME_ELECTRON && */ NODE_MODULE_VERSION >= 89
// this is a terrible thing we have to do because of https://github.com/electron/electron/issues/29893
v8::Local<v8::Object> bufferView;
bufferView = node::Buffer::New(Isolate::GetCurrent(), transfer_buffer, 0, transfer_buffer_length * sizeof(uint32_t)).ToLocalChecked();
auto js_point_transfer_buffer = node::Buffer::Data(bufferView);
bufferView = node::Buffer::New(Isolate::GetCurrent(), (char *) transfer_buffer, transfer_buffer_length * sizeof(uint32_t)).ToLocalChecked();
Nan::Set(Nan::New(module_exports), Nan::New("nodeTransferArray").ToLocalChecked(), bufferView);
#elif (V8_MAJOR_VERSION > 8 || (V8_MAJOR_VERSION == 8 && V8_MINOR_VERION > 3))
auto backing_store = ArrayBuffer::NewBackingStore(transfer_buffer, transfer_buffer_length * sizeof(uint32_t), BackingStore::EmptyDeleter, nullptr);
auto js_transfer_buffer = ArrayBuffer::New(Isolate::GetCurrent(), std::move(backing_store));
Nan::Set(Nan::New(module_exports), Nan::New("nodeTransferArray").ToLocalChecked(), Uint32Array::New(js_transfer_buffer, 0, transfer_buffer_length));
#else
auto js_transfer_buffer = ArrayBuffer::New(Isolate::GetCurrent(), transfer_buffer, transfer_buffer_length * sizeof(uint32_t));
Nan::Set(Nan::New(module_exports), Nan::New("nodeTransferArray").ToLocalChecked(), Uint32Array::New(js_transfer_buffer, 0, transfer_buffer_length));
#endif

Nan::Set(
Nan::New(module_exports),
Nan::New("nodeTransferArray").ToLocalChecked(),
Uint32Array::New(js_transfer_buffer, 0, transfer_buffer_length)
);
}
}

Expand Down Expand Up @@ -94,17 +91,22 @@ Local<Value> GetMarshalNodes(const Nan::FunctionCallbackInfo<Value> &info,

Local<Value> GetMarshalNode(const Nan::FunctionCallbackInfo<Value> &info, const Tree *tree, TSNode node) {
const auto &cache_entry = tree->cached_nodes_.find(node.id);
auto cond = cache_entry == tree->cached_nodes_.end();
auto end = tree->cached_nodes_.end();
if (cache_entry == tree->cached_nodes_.end()) {
setup_transfer_buffer(1);
uint32_t *p = transfer_buffer;
auto sizeOfId = sizeof(node.id);
MarshalNodeId(node.id, p);
p += 2;
*(p++) = node.context[0];
*(p++) = node.context[1];
*(p++) = node.context[2];
*(p++) = node.context[3];
auto cond2 = !!node.id;
if (node.id) {
return Nan::New(ts_node_symbol(node));
auto res = ts_node_symbol(node);
return Nan::New(res);
}
} else {
return Nan::New(cache_entry->second->node);
Expand Down