Skip to content
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

Make class clickable in Log stream (to open in IDE) #15761

Merged
merged 1 commit into from
Mar 17, 2021
Merged

Make class clickable in Log stream (to open in IDE) #15761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions extensions/vertx-http/deployment/src/main/resources/dev-static/css/logstream.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,7 @@
#logstreamViewLogButtonIcon:hover {
color: #3366ac !important;
}

.clickable-app-class:hover {
cursor:pointer;
}
53 changes: 41 additions & 12 deletions extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,27 +503,47 @@ function getLoggerClassName(loggerClassName){
return "";
}

function getClassFullAbbreviatedName(sourceClassNameFull, sourceClassNameFullShort) {
function getClassFullAbbreviatedName(sourceClassNameFull, lineNumber, sourceClassNameFullShort) {
if($('#logstreamColumnsModalSourceClassFullAbbreviatedSwitch').is(":checked")){
return "<span class='text-secondary' data-toggle='tooltip' data-placement='top' title='" + sourceClassNameFull + "'>[" + sourceClassNameFullShort + "]</span>" + tab;
if (isClickableClassName(sourceClassNameFull)) {
return makeClickableClassNameLink(sourceClassNameFull, lineNumber, sourceClassNameFullShort);
}
return "<span class='text-secondary'>[" + sourceClassNameFullShort + "]</span>" + tab;
}
return "";
}

function getFullClassName(sourceClassNameFull) {
function getFullClassName(sourceClassNameFull, lineNumber) {
if($('#logstreamColumnsModalSourceClassFullSwitch').is(":checked")){
if (isClickableClassName(sourceClassNameFull)) {
return makeClickableClassNameLink(sourceClassNameFull, lineNumber, sourceClassNameFull);
}
return "<span class='text-secondary'>[" + sourceClassNameFull + "]</span>" + tab;
}
return "";
}

function getClassName(className) {
function getClassName(sourceClassNameFull, lineNumber, className) {
if($('#logstreamColumnsModalSourceClassSwitch').is(":checked")){
if (isClickableClassName(sourceClassNameFull)) {
return makeClickableClassNameLink(sourceClassNameFull, lineNumber, className);
}
return "<span class='text-secondary'>[" + className + "]</span>" + tab;
}
return "";
}

function isClickableClassName(className){
if (className !== undefined && appClassLang(className) && ideKnown()) {
return true;
}
return false;
}

function makeClickableClassNameLink(className, lineNumber, display){
return "<a class='text-secondary clickable-app-class' onclick='openInIDE(\"" + className + "\",\"" + lineNumber + "\");'>[" + display + "]</a>" + tab;
}

function getMethodName(methodName) {
if($('#logstreamColumnsModalSourceMethodNameSwitch').is(":checked")){
return methodName + tab;
Expand Down Expand Up @@ -596,7 +616,7 @@ function makeLink(message, protocol){
return message.replace(url, link);
}

function enhanceStacktrace(loggerName, stacktrace) {
function enhanceStacktrace(stacktrace) {
var enhanceStacktrace = [];
var lines = stacktrace.split('\n');
for (var i = 0; i < lines.length; i++) {
Expand All @@ -607,9 +627,18 @@ function enhanceStacktrace(loggerName, stacktrace) {
var parts = line.split(":");
line = "<b>" + parts[0] + ":</b>" + parts[1];
} else {
var isMyClass = line.includes(loggerName);
if (isMyClass && loggerName) {
line = '<b>' + line + '</b>';
if(!line.includes(".zig")){
var parts = line.split(" ");
// Make it clickable
var classMethodFileNumber = parts[1];
var classMethodFileNumberSplit = classMethodFileNumber.split("(");
var classMethod = classMethodFileNumberSplit[0];
var fileNumber = classMethodFileNumberSplit[1];
givenClassName = classMethod.substring(0, classMethod.lastIndexOf('.'));
if(isClickableClassName(givenClassName)){
lineNumber = fileNumber.substring(fileNumber.lastIndexOf(':') + 1, fileNumber.lastIndexOf(')'));
line = "<a class='text-wrap text-danger clickable-app-class' onclick='openInIDE(\"" + givenClassName + "\",\"" + lineNumber + "\");'><b>" + line + "</b></a>";
}
}
line = space + space + space + space + space + space + line;
}
Expand Down Expand Up @@ -681,9 +710,9 @@ function openSocket() {
+ getLoggerNameAbbreviated(json.loggerNameShort)
+ getLoggerName(json.loggerName)
+ getLoggerClassName(json.loggerClassName)
+ getClassFullAbbreviatedName(json.sourceClassNameFull, json.sourceClassNameFullShort)
+ getFullClassName(json.sourceClassNameFull)
+ getClassName(json.sourceClassName)
+ getClassFullAbbreviatedName(json.sourceClassNameFull, json.sourceLineNumber,json.sourceClassNameFullShort)
+ getFullClassName(json.sourceClassNameFull,json.sourceLineNumber)
+ getClassName(json.sourceClassNameFull,json.sourceLineNumber,json.sourceClassName)
+ getMethodName(json.sourceMethodName)
+ getFileName(json.sourceFileName)
+ getLineNumber(json.sourceLineNumber)
Expand All @@ -695,7 +724,7 @@ function openSocket() {

if (json.stacktrace) {
for (var i in json.stacktrace) {
var stacktrace = enhanceStacktrace(json.loggerName, json.stacktrace[i]);
var stacktrace = enhanceStacktrace(json.stacktrace[i]);
htmlLine = htmlLine + stacktrace;
}
}
Expand Down