vscode-zap
Advanced tools
Comparing version 0.0.34 to 0.0.35
@@ -77,10 +77,2 @@ import { WorkspaceOp } from "libzap/lib/ot/workspace"; | ||
private recordSelection(doc, sel); | ||
/** | ||
* concurrentOpWhileApplyingOp is the operation (possibly composed | ||
* of multiple sequential operations) that represents all of the | ||
* changes received by the onDidChangeTextDocument listener while | ||
* we were in the doApply method's vscode.workspace.applyEdit | ||
* call. It is used by the doApply method to compensate for | ||
* concurrent changes that yield incorrect document contents. | ||
*/ | ||
private documentDirty; | ||
@@ -87,0 +79,0 @@ private onDidChangeTextDocument(ev); |
@@ -35,11 +35,2 @@ "use strict"; | ||
}); | ||
/** | ||
* concurrentOpWhileApplyingOp is the operation (possibly composed | ||
* of multiple sequential operations) that represents all of the | ||
* changes received by the onDidChangeTextDocument listener while | ||
* we were in the doApply method's vscode.workspace.applyEdit | ||
* call. It is used by the doApply method to compensate for | ||
* concurrent changes that yield incorrect document contents. | ||
*/ | ||
// private concurrentOpWhileApplyingOp?: WorkspaceOp; | ||
this.documentDirty = new Map(); | ||
@@ -202,8 +193,2 @@ // Give onOpListener default noop value; | ||
// vscode.workspace.applyEdit's promise resolves. | ||
const preEditDocVersions = new Map(); | ||
for (const doc of vscode.workspace.textDocuments) { | ||
if (edit.has(doc.uri)) { | ||
preEditDocVersions.set(doc.uri.toString(), doc.version); | ||
} | ||
} | ||
yield vscode.workspace.applyEdit(edit).then((ok) => { | ||
@@ -525,5 +510,6 @@ if (!ok) { | ||
// | ||
// We need to produce the op X that doApply needs to | ||
// execute such that the following composition of ops | ||
// yields the correct document state: | ||
// We need to "fix" the incorrect op that was applied so | ||
// that we end up in the correct end state. We need X such | ||
// that the following composition of ops yields the | ||
// correct document state: | ||
// | ||
@@ -536,3 +522,3 @@ // op + this.applyingOp + X | ||
// | ||
// which means: | ||
// which means (by algebra): | ||
// | ||
@@ -539,0 +525,0 @@ // this.applyingOp + X == a1 |
@@ -5,3 +5,3 @@ { | ||
"description": "WIP", | ||
"version": "0.0.34", | ||
"version": "0.0.35", | ||
"publisher": "sqs", | ||
@@ -25,3 +25,3 @@ "preview": true, | ||
"scripts": { | ||
"lint": "tslint --force --format verbose \"src/**/*.ts\"", | ||
"lint": "tslint --format verbose \"src/**/*.ts\"", | ||
"vscode:prepublish": "tsc -p ./", | ||
@@ -43,3 +43,3 @@ "compile": "tsc -p ./", | ||
"dependencies": { | ||
"libzap": "^0.0.34", | ||
"libzap": "^0.0.35", | ||
"open": "^0.0.5", | ||
@@ -46,0 +46,0 @@ "vscode-jsonrpc": "3.0.1-alpha.7" |
@@ -209,9 +209,2 @@ import * as vscode from "vscode"; | ||
const preEditDocVersions = new Map<string, number>(); | ||
for (const doc of vscode.workspace.textDocuments) { | ||
if (edit.has(doc.uri)) { | ||
preEditDocVersions.set(doc.uri.toString(), doc.version); | ||
} | ||
} | ||
await vscode.workspace.applyEdit(edit).then((ok) => { | ||
@@ -490,12 +483,2 @@ if (!ok) { | ||
/** | ||
* concurrentOpWhileApplyingOp is the operation (possibly composed | ||
* of multiple sequential operations) that represents all of the | ||
* changes received by the onDidChangeTextDocument listener while | ||
* we were in the doApply method's vscode.workspace.applyEdit | ||
* call. It is used by the doApply method to compensate for | ||
* concurrent changes that yield incorrect document contents. | ||
*/ | ||
// private concurrentOpWhileApplyingOp?: WorkspaceOp; | ||
private documentDirty = new Map<string, boolean>(); | ||
@@ -579,5 +562,6 @@ | ||
// | ||
// We need to produce the op X that doApply needs to | ||
// execute such that the following composition of ops | ||
// yields the correct document state: | ||
// We need to "fix" the incorrect op that was applied so | ||
// that we end up in the correct end state. We need X such | ||
// that the following composition of ops yields the | ||
// correct document state: | ||
// | ||
@@ -590,3 +574,3 @@ // op + this.applyingOp + X | ||
// | ||
// which means: | ||
// which means (by algebra): | ||
// | ||
@@ -593,0 +577,0 @@ // this.applyingOp + X == a1 |
Sorry, the diff of this file is not supported yet
378993
5736
+ Addedlibzap@0.0.35(transitive)
- Removedlibzap@0.0.34(transitive)
Updatedlibzap@^0.0.35