resolve merge conflicts

Signed-off-by: Sanjula Ganepola <[email protected]>

Author: SanjulaGanepola

extension/server/src/data.ts

@@ -58,8 +58,8 @@ export function dspffdToRecordFormats(data: any, aliases = false): Declaration[]
 			field: ``,
 			pos: ``
 		});
-
-		currentSubfield.tags.push({tag: `description`, content: text.trim()})
+		
+		currentSubfield.tags.push({tag: `description`, content: text.trim()});
 
 		recordFormat.subItems.push(currentSubfield);
 	});

extension/server/src/providers/codeActions.ts

@@ -34,7 +34,7 @@ export default async function genericCodeActionsProvider(params: CodeActionParam
 
 				const extractOption = getExtractProcedureAction(document, docs, range);
 				if (extractOption) {
-					return [extractOption];
+					actions.push(extractOption);
 				}
 
 				const linterActions = await getLinterCodeActions(docs, document, range);
@@ -47,6 +47,11 @@ export default async function genericCodeActionsProvider(params: CodeActionParam
 			if (testActions) {
 				actions.push(...testActions);
 			}
+
+			const monitorAction = surroundWithMonitorAction(isFree, document, docs, range);
+			if (monitorAction) {
+				actions.push(monitorAction);
+			}
 		}
 	}
 
@@ -327,11 +332,105 @@ function getAssertion(type: RpgleVariableType): string {
 	}
 }
 
-
 function asPosix(inPath?: string) {
 	return inPath ? inPath.split(path.sep).join(path.posix.sep) : ``;
 }
 
+function lineAt(document: TextDocument, line: number): string {
+	return document.getText(Range.create(line, 0, line, 1000)).trimEnd();
+}
+
+function getBodyRangeForRange(docs: Cache, rangeStart: number, rangeEnd: number, document: TextDocument) {
+	let validStart = -1;
+	let validEnd = -1;
+
+	const currentProcedure = docs.procedures.find(sub => rangeStart >= sub.position.range.line && rangeEnd <= sub.range.end!);
+
+	if (currentProcedure && currentProcedure.scope && currentProcedure.range.end) {
+		validStart = currentProcedure.scope.getDefinitionBlockEnd(document.uri) + 1;
+		validEnd = currentProcedure.range.end - 1;
+	} else {
+		validStart = docs.getDefinitionBlockEnd(document.uri) + 1;
+		const firstProc = docs.procedures.find(p => !Object.keys(p.keyword).some(k => k.toLowerCase().startsWith(`ext`)));
+		validEnd = firstProc && firstProc.range.start ? firstProc.range.start - 1 : document.lineCount - 1;
+	}
+
+	if (validStart < 0 || validEnd < 0) {
+		return;
+	}
+
+	return { validStart, validEnd };
+}
+
+function determineIndent(line: string): number {
+	const match = line.match(/^\s+/);
+	if (match) {
+		return match[0].length;
+	}
+	return 0;
+}
+
+export function surroundWithMonitorAction(isFree: boolean, document: TextDocument, docs: Cache, range: Range): CodeAction | undefined {
+	let rangeStart = range.start.line;
+	let rangeEnd = range.end.line;
+
+	if (rangeStart === rangeEnd) {
+		// Only works for multi-line selections
+		return;
+	}
+
+	const validRange = getBodyRangeForRange(docs, rangeStart, rangeEnd, document);
+
+	if (!validRange) {
+		return;
+	}
+
+	let indent = 0;
+
+	if (isFree) {
+		indent = determineIndent(lineAt(document, rangeStart));
+	} else {
+		const freePortion = lineAt(document, rangeStart).substring(7);
+		indent = determineIndent(freePortion) + 7;
+	}
+
+	const newLine = `\n`;
+	const indentStr = ` `.repeat(indent);
+	const space = `${newLine}${indentStr}`;
+
+	if (rangeStart >= validRange.validStart && rangeEnd <= validRange.validEnd) {
+		const refactorAction = CodeAction.create(`Surround with monitor`, CodeActionKind.RefactorRewrite);
+
+		refactorAction.edit = {
+			changes: {
+				[document.uri]: [
+					TextEdit.insert(
+						Position.create(rangeStart, 0),
+						`${indentStr}monitor;${newLine}`
+					),
+					TextEdit.insert(
+						Position.create(rangeEnd + 1, 0),
+						`${space}on-error *all;${space}  // TODO: implement${space}endmon;${newLine}`
+					)
+				]
+			},
+		};
+
+		if (isFree) {
+			// Then format the document
+			refactorAction.command = {
+				command: `editor.action.formatDocument`,
+				title: `Format`
+			};
+		}
+
+		return refactorAction;
+	}
+
+
+	return;
+}
+
 export function getSubroutineActions(document: TextDocument, docs: Cache, range: Range): CodeAction | undefined {
 	if (range.start.line === range.end.line) {
 		const currentGlobalSubroutine = docs.subroutines.find(sub => sub.position.range.line === range.start.line && sub.range.start && sub.range.end);
@@ -354,7 +453,7 @@ export function getSubroutineActions(document: TextDocument, docs: Cache, range:
 			const newProcedure = [
 				`Dcl-Proc ${currentGlobalSubroutine.name};`,
 				`  Dcl-Pi *N;`,
-				...extracted.references.map((ref, i) => `    ${extracted.newParamNames[i]} ${ref.dec.type === `struct` ? `likeDS` : `like`}(${ref.dec.name});`),
+				...extracted.references.map((ref, i) => `    ${extracted.newParamNames[i]} ${ref.dec.type === `struct` ? `LikeDS` : `Like`}(${ref.dec.name});`),
 				`  End-Pi;`,
 				``,
 				caseInsensitiveReplaceAll(extracted.newBody, `leavesr`, `return`),
@@ -393,39 +492,50 @@ export function getSubroutineActions(document: TextDocument, docs: Cache, range:
 }
 
 export function getExtractProcedureAction(document: TextDocument, docs: Cache, range: Range): CodeAction | undefined {
-	if (range.end.line > range.start.line) {
-		const lastLine = document.offsetAt({ line: document.lineCount, character: 0 });
+	const rangeStart = range.start.line;
+	const rangeEnd = range.end.line;
+	if (rangeEnd > rangeStart) {
 
-		const extracted = createExtract(document, range, docs);
+		const validRange = getBodyRangeForRange(docs, rangeStart, rangeEnd, document);
 
-		const newProcedure = [
-			`Dcl-Proc NewProcedure;`,
-			`  Dcl-Pi *N;`,
-			...extracted.references.map((ref, i) => `    ${extracted.newParamNames[i]} ${ref.dec.type === `struct` ? `likeDS` : `like`}(${ref.dec.name});`),
-			`  End-Pi;`,
-			``,
-			extracted.newBody,
-			`End-Proc;`
-		].join(`\n`)
+		if (!validRange) {
+			return;
+		}
 
-		const newAction = CodeAction.create(`Extract to new procedure`, CodeActionKind.RefactorExtract);
+		// Ensure the selected range is within a body range
+		if (rangeStart >= validRange.validStart && rangeEnd <= validRange.validEnd) {
+			const extracted = createExtract(document, range, docs);
 
-		// First do the exit
-		newAction.edit = {
-			changes: {
-				[document.uri]: [
-					TextEdit.replace(extracted.range, `NewProcedure(${extracted.references.map(r => r.dec.name).join(`:`)});`),
-					TextEdit.insert(document.positionAt(lastLine), `\n\n` + newProcedure)
-				]
-			},
-		};
+			const newProcedure = [
+				`Dcl-Proc NewProcedure;`,
+				`  Dcl-Pi *N;`,
+				...extracted.references.map((ref, i) => `    ${extracted.newParamNames[i]} ${ref.dec.type === `struct` ? `LikeDS` : `Like`}(${ref.dec.name});`),
+				`  End-Pi;`,
+				``,
+				extracted.newBody,
+				`End-Proc;`
+			].join(`\n`)
 
-		// Then format the document
-		newAction.command = {
-			command: `editor.action.formatDocument`,
-			title: `Format`
-		};
+			const newAction = CodeAction.create(`Extract to new procedure`, CodeActionKind.RefactorExtract);
+			const lastLine = document.offsetAt({ line: document.lineCount, character: 0 });
 
-		return newAction;
+			// First do the exit
+			newAction.edit = {
+				changes: {
+					[document.uri]: [
+						TextEdit.replace(extracted.range, `NewProcedure(${extracted.references.map(r => r.dec.name).join(`:`)});`),
+						TextEdit.insert(document.positionAt(lastLine), `\n\n` + newProcedure)
+					]
+				},
+			};
+
+			// Then format the document
+			newAction.command = {
+				command: `editor.action.formatDocument`,
+				title: `Format`
+			};
+
+			return newAction;
+		}
 	}
 }

extension/server/src/providers/linter/codeActions.ts

@@ -1,6 +1,5 @@
-import { CodeAction, CodeActionKind, CodeActionParams, Range } from 'vscode-languageserver';
-import { getActions, getExtractProcedureAction, getSubroutineActions, refreshLinterDiagnostics } from '.';
-import { documents, parser } from '..';
+import { Range } from 'vscode-languageserver';
+import { getActions, refreshLinterDiagnostics } from '.';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import Cache from '../../../../../language/models/cache';
 

language/models/cache.ts

@@ -95,7 +95,7 @@ export default class Cache {
    * @param {string} fsPath Path to check
    * @returns {number} Line number
    */
-  getDefinitionBlockEnd(fsPath) {
+  getDefinitionBlockEnd(fsPath: string) {
     const lasts = [
       this.procedures.filter(d => d.position.path === fsPath && d.keyword[`EXTPROC`] !== undefined).pop(),
       this.structs.filter(d => d.position.path === fsPath).pop(),