Skip to content

Bugfix/error lines not displayed on windows #26

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/error lines not displayed on windows #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
262c0e0
Make split index OS depentend
Efratror Apr 1, 2022
a628e90
Make check line = path OS-depentent
Efratror Apr 1, 2022
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
15 changes: 13 additions & 2 deletions server/src/diagnostics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,22 @@ export function cookCompilationDiagnostics(processedText: string, pwd: String){
tempSplit.forEach(function(line:String, index: number){
if(line.includes(`${pwd}`)){
let innerSplit = line.split(":")

// Windows paths have a colon after the drive letter
// Shifts the error colon by one in the array
let splitIndex
if(process.platform === 'win32') {
splitIndex = 2
}
else {
splitIndex = 1
}

// Handling line number based on current Behaviour - since preprocessing is done
if(preProcessingClass.defaultBehaviourEnable){
errorNodeLine[errorNodeCount] = +innerSplit[1] - pStandards.reduceLineDefaultBehaviour
errorNodeLine[errorNodeCount] = +innerSplit[splitIndex] - pStandards.reduceLineDefaultBehaviour
} else if(preProcessingClass.methodBehaviourEnable){
errorNodeLine[errorNodeCount] = +innerSplit[1] - pStandards.reduceLineMethodBehaviour
errorNodeLine[errorNodeCount] = +innerSplit[splitIndex] - pStandards.reduceLineMethodBehaviour
}
let localIndex = index + 1
errorNodeReasons[errorNodeCount] = line.split("error:")[1]
Expand Down
8 changes: 7 additions & 1 deletion server/src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ export function parseAST(processedText: string, textDocument: TextDocument) {

// Wrote methods to handle Error in the Error Stream
// diagnostics.cookDiagnosticsReport(processedText)
diagnostics.cookCompilationDiagnostics(processedText, `${__dirname}/compile/${pStandards.defaultClassName}.java`)
let pwd
if (process.platform === 'win32') {
pwd =`${__dirname}\\compile\\${pStandards.defaultClassName}.java`
}else {
pwd = `${__dirname}/compile/${pStandards.defaultClassName}.java`
}
diagnostics.cookCompilationDiagnostics(processedText, pwd)


log.writeLog("Parse Tree construction Successfully")
Expand Down