Merge and resolve conflicts

Author: bramburn

extension-decoupler/decoupleExtension.js

@@ -0,0 +1,124 @@
+const { TextDocument } = require('vscode-languageserver-textdocument');
+const { createConnection, TextDocuments, ProposedFeatures } = require('vscode-languageserver/node');
+const ts = require('typescript');
+const fs = require('fs/promises');
+const path = require('path');
+
+async function decoupleFile(inputFilePath) {
+    // Read the source file
+    const sourceCode = await fs.readFile(inputFilePath, 'utf-8');
+    
+    // Create output directory
+    const outputDir = path.join(path.dirname(inputFilePath), 'decoupled');
+    await fs.mkdir(outputDir, { recursive: true });
+
+    // Parse the source file
+    const sourceFile = ts.createSourceFile(
+        inputFilePath,
+        sourceCode,
+        ts.ScriptTarget.Latest,
+        true
+    );
+
+    // Store different sections
+    const sections = new Map();
+    
+    // Visit nodes and collect classes and major sections
+    function visit(node) {
+        if (ts.isClassDeclaration(node) && node.name) {
+            // Handle classes
+            const className = node.name.text;
+            const classCode = sourceCode.substring(node.pos, node.end);
+            sections.set(`${className}.js`, classCode);
+        } 
+        else if (ts.isFunctionDeclaration(node) && node.name) {
+            // Handle named functions
+            const functionName = node.name.text;
+            const functionCode = sourceCode.substring(node.pos, node.end);
+            sections.set(`${functionName}.js`, functionCode);
+        }
+        else if (ts.isVariableStatement(node)) {
+            // Handle major variable declarations
+            const declarations = node.declarationList.declarations;
+            for (const decl of declarations) {
+                if (decl.name && ts.isIdentifier(decl.name)) {
+                    const varName = decl.name.text;
+                    const varCode = sourceCode.substring(node.pos, node.end);
+                    sections.set(`${varName}.js`, varCode);
+                }
+            }
+        }
+        
+        ts.forEachChild(node, visit);
+    }
+
+    // Start the visitor pattern
+    visit(sourceFile);
+
+    // Create index.js to re-export everything
+    let indexContent = '';
+
+    // Write sections to files
+    for (const [filename, content] of sections) {
+        const filePath = path.join(outputDir, filename);
+        await fs.writeFile(filePath, content);
+        
+        // Add to index.js
+        const moduleName = path.basename(filename, '.js');
+        indexContent += `const { ${moduleName} } = require('./${filename}');\n`;
+    }
+
+    // Export all modules in index.js
+    indexContent += '\nmodule.exports = {\n';
+    for (const [filename] of sections) {
+        const moduleName = path.basename(filename, '.js');
+        indexContent += `    ${moduleName},\n`;
+    }
+    indexContent += '};\n';
+
+    await fs.writeFile(path.join(outputDir, 'index.js'), indexContent);
+
+    // Create package.json
+    const packageJson = {
+        name: "decoupled-extension",
+        version: "1.0.0",
+        description: "Decoupled version of extension.js",
+        main: "index.js",
+        dependencies: {
+            "vscode-languageserver": "^8.0.0",
+            "vscode-languageserver-textdocument": "^1.0.8",
+            "typescript": "^4.9.0"
+        }
+    };
+
+    await fs.writeFile(
+        path.join(outputDir, 'package.json'),
+        JSON.stringify(packageJson, null, 2)
+    );
+}
+
+// Function to analyze code sections using LSP
+async function analyzeSections(document) {
+    const connection = createConnection(ProposedFeatures.all);
+    const documents = new TextDocuments(TextDocument);
+    
+    documents.listen(connection);
+    connection.listen();
+
+    // Add LSP-specific analysis here if needed
+    // This can be extended to use LSP features for better code understanding
+}
+
+// Main execution
+async function main() {
+    const inputFile = process.argv[2] || 'extension.js';
+    
+    try {
+        await decoupleFile(inputFile);
+        console.log('Successfully decoupled the file into separate modules!');
+    } catch (error) {
+        console.error('Error decoupling file:', error);
+    }
+}
+
+main();

extension-decoupler/decoupled/$$.js

@@ -0,0 +1,9 @@
+
+	var Hke = k$(),
+		$$ = gd(),
+		Wke = G$(),
+		Y$ = NaN,
+		Gke = /^[-+]0x[0-9a-f]+$/i,
+		$ke = /^0b[01]+$/i,
+		Yke = /^0o[0-7]+$/i,
+		Kke = parseInt

extension-decoupler/decoupled/$.js

@@ -0,0 +1,5 @@
+
+	var Zae = Yt(),
+		Xae = jae(),
+		$ = (tle.exports = Zae.util = Zae.util || {})
+	;

extension-decoupler/decoupled/$0.js

@@ -0,0 +1,3 @@
+
+	var Fe = G0.asn1,
+		$0 = (sce.exports = G0.pkcs7asn1 = G0.pkcs7asn1 || {})

extension-decoupler/decoupled/$0e.js

@@ -0,0 +1,7 @@
+
+	var $0e = Ws(),
+		Zdt = (e, t, r) => {
+			let n = new $0e(e, r),
+				i = new $0e(t, r)
+			return n.compare(i) || n.compareBuild(i)
+		}

extension-decoupler/decoupled/$0t.js

@@ -0,0 +1,88 @@
+
+var $0t = 2e3,
+	S1 = class extends z {
+		constructor(r, n, i, s, o) {
+			super()
+			this._completionsModel = r
+			this._config = s
+			this._timelineReporter = o
+			;(this._pendingCompletions = new w1(n)),
+				(this._stateController = new yA(i)),
+				this.addDisposable(this._pendingCompletions),
+				this.addDisposable(this._deletedCompletions),
+				this.addDisposable(
+					Xh.window.onDidChangeTextEditorSelection((a) => {
+						a.textEditor.document.uri.scheme === "file" && uf(!1)
+					}),
+				)
+		}
+		_logger = X("InlineCompletionProvider")
+		_pendingCompletions
+		_deletedCompletions = new I1()
+		_stateController
+		async provideInlineCompletionItems(r, n, i, s) {
+			let o = new _1()
+			if (
+				!this._config.config.completions.enableAutomaticCompletions &&
+				i.triggerKind === Xh.InlineCompletionTriggerKind.Automatic
+			)
+				return uf(!1), []
+			this._stateController.dispose(),
+				this._logger.debug(
+					`Inline Request - ${r.uri.toString()} ${Zh(r, n)}${v1(" ", i.selectedCompletionInfo?.text)}`,
+				),
+				this._logger.verbose(Dxe(r, i))
+			let a = await this._getCompletions(r, n, i, o),
+				l = this._deletedCompletions.processRequest(a)
+			if (s.isCancellationRequested) return this._logger.debug("Completion cancelled"), pxe(), uf(!1), []
+			if ((gxe(l), !l)) return this._logger.debug("Returning no completions"), uf(!1), []
+			;(o.emitTime = Date.now()), l.isReused || this._timelineReporter.reportCompletionTimeline(l.requestId, o)
+			let c = l.completions.map((u) => {
+				this._logger.verbose(`AugmentCompletion: ${u.toString()}`)
+				let f = new Xh.InlineCompletionItem(
+					u.completionText + u.suffixReplacementText,
+					new Xh.Range(
+						r.positionAt(u.range.startOffset),
+						r.positionAt(u.range.endOffset + u.skippedSuffix.length),
+					),
+				)
+				return (
+					this._logger.verbose(`InlineCompletionItem: ${JSON.stringify(f.insertText)} ${AC(r, f.range)}`), f
+				)
+			})
+			return c.length > 0 && uf(!0), c
+		}
+		async _getCompletions(r, n, i, s) {
+			let o = this._pendingCompletions.getPendingCompletion(r, n)
+			if (o && o.completions.length > 0) {
+				let l = this._processCompletionForMode(o, i)
+				return this._logger.debug(`Returning ${l.length} completions`), { ...o, completions: l }
+			}
+			if (i.selectedCompletionInfo?.text) {
+				this._logger.debug(
+					"Returning no completions because the provider request includes selected text that does not match an Augment suggestion",
+				)
+				return
+			}
+			let a = this._stateController.setState($xe)
+			try {
+				let l = await this._completionsModel.generateCompletion(r, n, s)
+				if (l && l.completions.length === 0) {
+					let c = this._stateController.setState(Yxe)
+					setTimeout(() => {
+						c.dispose()
+					}, $0t)
+				}
+				return l
+			} catch (l) {
+				l instanceof bh || this._stateController.setState(Gxe)
+			} finally {
+				a.dispose()
+			}
+		}
+		_processCompletionForMode(r, n) {
+			if (!n.selectedCompletionInfo || !n.selectedCompletionInfo.text) return r.completions
+			let i = n.selectedCompletionInfo.range.start
+			return r.completions.map((o) => C1(r, o, i))
+		}
+	}

extension-decoupler/decoupled/$1.js

@@ -0,0 +1,25 @@
+
+var $1 = class e extends Zn {
+	constructor(r, n, i, s) {
+		super("NextEditResolutionReporter", n ?? e.defaultMaxRecords, i ?? e.defaultUploadMsec, s ?? e.defaultBatchSize)
+		this._apiServer = r
+	}
+	static defaultMaxRecords = 1e4
+	static defaultBatchSize = 1e3
+	static defaultUploadMsec = 1e4
+	reportResolution(r, n, i, s) {
+		let [o, a] = kn(n),
+			[l, c] = kn(i)
+		this.report({
+			request_id: r,
+			emit_time_sec: o,
+			emit_time_nsec: a,
+			resolve_time_sec: l,
+			resolve_time_nsec: c,
+			is_accepted: s,
+		})
+	}
+	performUpload(r) {
+		return this._apiServer.resolveNextEdits(r)
+	}
+}

extension-decoupler/decoupled/$1e.js

@@ -0,0 +1,6 @@
+
+function $1e(e) {
+	if (e === null) return !0
+	var t = e.length
+	return (t === 1 && e === "~") || (t === 4 && (e === "null" || e === "Null" || e === "NULL"))
+}

extension-decoupler/decoupled/$2.js

@@ -0,0 +1,31 @@
+
+				function $2(d, h, A) {
+					var E = $i(h),
+						S = qw(h, E)
+					A == null &&
+						!(Un(h) && (S.length || !E.length)) &&
+						((A = h), (h = d), (d = this), (S = qw(h, $i(h))))
+					var P = !(Un(A) && "chain" in A) || !!A.chain,
+						U = ud(d)
+					return (
+						ds(S, function (H) {
+							var Z = h[H]
+							;(d[H] = Z),
+								U &&
+									(d.prototype[H] = function () {
+										var ce = this.__chain__
+										if (P || ce) {
+											var ue = d(this.__wrapped__),
+												Ae = (ue.__actions__ = wo(this.__actions__))
+											return (
+												Ae.push({ func: Z, args: arguments, thisArg: d }),
+												(ue.__chain__ = ce),
+												ue
+											)
+										}
+										return Z.apply(d, js([this.value()], arguments))
+									})
+						}),
+						d
+					)
+				}

extension-decoupler/decoupled/$2e.js

@@ -0,0 +1,15 @@
+
+	var W2e = /^[_:A-Za-z][-.:\w]+$/,
+		G2e = /^([_A-Za-z][-.\w]+|[_A-Za-z][-.\w]+:[_A-Za-z][-.\w]+)$/,
+		Kv =
+			"_A-Za-z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD",
+		Jv =
+			"-._A-Za-z0-9\xB7\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0300-\u037D\u037F-\u1FFF\u200C\u200D\u203F\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD",
+		Jg = "[" + Kv + "][" + Jv + "]*",
+		dL = Kv + ":",
+		fL = Jv + ":",
+		$2e = new RegExp("^[" + dL + "][" + fL + "]*$"),
+		Y2e = new RegExp("^(" + Jg + "|" + Jg + ":" + Jg + ")$"),
+		bJ = /[\uD800-\uDB7F\uDC00-\uDFFF]/,
+		xJ = /[\uD800-\uDB7F\uDC00-\uDFFF]/g,
+		_J = /[\uD800-\uDB7F][\uDC00-\uDFFF]/g