[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 7e1db94 07/56: file remapping changes
From: |
Rocky Bernstein |
Subject: |
[elpa] master 7e1db94 07/56: file remapping changes |
Date: |
Sat, 27 May 2017 05:02:28 -0400 (EDT) |
branch: master
commit 7e1db940a394e1e5b8b8ab92b3ddbae48312a587
Author: rocky <address@hidden>
Commit: rocky <address@hidden>
file remapping changes
* command.el: Show file remapping in Describe buffer; add cmdbuf-reset
* jdb.el: make file mapping hash buffer local
---
realgud/common/buffer/command.el | 121 ++++++++++++++++++++++-----------------
realgud/debugger/jdb/jdb.el | 9 ++-
2 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/realgud/common/buffer/command.el b/realgud/common/buffer/command.el
index 760db53..55c4679 100644
--- a/realgud/common/buffer/command.el
+++ b/realgud/common/buffer/command.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <address@hidden>
;; This program is free software; you can redistribute it and/or modify
@@ -132,19 +132,28 @@
(buffer (get-text-property pos 'buffer)))
(find-file-other-window (buffer-file-name buffer))))
-(defun realgud:cmdbuf-buffers-describe (buffer-list)
- (insert "** Source Buffers Seen\n")
- (dolist (buffer buffer-list)
- (insert " - ")
- (put-text-property
- (insert-text-button
- (buffer-name buffer)
- 'action 'realgud:cmdbuf-follow-buffer
- 'help-echo "mouse-2: visit this file")
- (point)
- 'buffer buffer)
- (insert "\n")
- ))
+(defun realgud:cmdbuf-buffers-describe (info)
+ (let* ((buffer-list (realgud-cmdbuf-info-srcbuf-list info))
+ (debugger-name (realgud-cmdbuf-info-debugger-name info))
+ (file-remap-name (intern (format "realgud:%s-file-remap"
debugger-name)))
+ (file-remap (and (boundp file-remap-name) (eval file-remap-name)))
+ (filename)
+ (remapped-filename)
+ )
+ (insert "** Source Buffers Seen\n")
+ (dolist (buffer buffer-list)
+ (insert " - ")
+ (put-text-property
+ (insert-text-button
+ (setq filename (buffer-name buffer))
+ 'action 'realgud:cmdbuf-follow-buffer
+ 'help-echo "mouse-2: visit this file")
+ (point)
+ 'buffer buffer)
+ (when (setq remapped-filename (and file-remap (gethash filename
file-remap)))
+ (insert (format "\tremapped to: %s" remapped-filename)))
+ (insert "\n")
+ )))
(defun realgud:cmdbuf-info-describe (&optional buffer)
"Display realgud-cmdcbuf-info fields of BUFFER.
@@ -157,44 +166,48 @@ Information is put in an internal buffer called
*Describe*."
(with-current-buffer buffer
(let ((info realgud-cmdbuf-info)
(cmdbuf-name (buffer-name)))
- (switch-to-buffer (get-buffer-create "*Describe*"))
- (setq buffer-read-only 'nil)
- (delete-region (point-min) (point-max))
- (insert "#+STARTUP: showall\n")
- ;;(insert "#+OPTIONS: H:2 num:nil toc:t \\n:nil ::t |:t ^:nil -:t
f:t *:t tex:t d:(HIDE) tags:not-in-toc\n")
- (insert (format "#+TITLE: Debugger info for %s\n" cmdbuf-name))
- (insert "** General Information\n")
- (mapc 'insert
- (list
- (format " - Debugger name ::\t%s\n"
- (json-encode (realgud-cmdbuf-info-debugger-name info)))
- (format " - Command-line args ::\t%s\n"
- (json-encode (realgud-cmdbuf-info-cmd-args info)))
- (format " - Starting directory ::\t%s\n"
- (realgud-cmdbuf-info-starting-directory info))
- (format " - Selected window should contain source? :: %s\n"
- (realgud-cmdbuf-info-in-srcbuf? info))
- (format " - Last input end ::\t%s\n"
- (realgud-cmdbuf-info-last-input-end info))
- (format " - Source should go into short-key mode? :: %s\n"
- (realgud-cmdbuf-info-src-shortkey? info))
- (format " - Breakpoint list ::\t %s\n"
- (realgud-cmdbuf-info-bp-list info))
- (format " - Remap table for debugger commands ::\n\t%s\n"
- (json-encode (realgud-cmdbuf-info-cmd-hash info)))
- (format " - Backtrace buffer ::\t%s\n"
- (realgud-cmdbuf-info-bt-buf info))
- (format " - In debugger? ::\t%s\n"
- (realgud-cmdbuf-info-in-debugger? info))
- ))
- (insert "\n")
- (realgud:cmdbuf-buffers-describe (realgud-cmdbuf-info-srcbuf-list
info))
- (insert "\n")
- (realgud:loc-hist-describe (realgud-cmdbuf-info-loc-hist info))
- (goto-char (point-min))
- (realgud:info-mode)
+ (if info
+ (progn
+ (switch-to-buffer (get-buffer-create "*Describe*"))
+ (setq buffer-read-only 'nil)
+ (delete-region (point-min) (point-max))
+ (insert "#+STARTUP: showall\n")
+ ;;(insert "#+OPTIONS: H:2 num:nil toc:t \\n:nil ::t |:t
^:nil -:t f:t *:t tex:t d:(HIDE) tags:not-in-toc\n")
+ (insert (format "#+TITLE: Debugger info for %s\n" cmdbuf-name))
+ (insert "** General Information\n")
+ (mapc 'insert
+ (list
+ (format " - Debugger name ::\t%s\n"
+ (json-encode (realgud-cmdbuf-info-debugger-name
info)))
+ (format " - Command-line args ::\t%s\n"
+ (json-encode (realgud-cmdbuf-info-cmd-args
info)))
+ (format " - Starting directory ::\t%s\n"
+ (realgud-cmdbuf-info-starting-directory info))
+ (format " - Selected window should contain source? ::
%s\n"
+ (realgud-cmdbuf-info-in-srcbuf? info))
+ (format " - Last input end ::\t%s\n"
+ (realgud-cmdbuf-info-last-input-end info))
+ (format " - Source should go into short-key mode? ::
%s\n"
+ (realgud-cmdbuf-info-src-shortkey? info))
+ (format " - Breakpoint list ::\t %s\n"
+ (realgud-cmdbuf-info-bp-list info))
+ (format " - Remap table for debugger commands
::\n\t%s\n"
+ (json-encode (realgud-cmdbuf-info-cmd-hash
info)))
+ (format " - Backtrace buffer ::\t%s\n"
+ (realgud-cmdbuf-info-bt-buf info))
+ (format " - In debugger? ::\t%s\n"
+ (realgud-cmdbuf-info-in-debugger? info))
+ ))
+ (insert "\n")
+ (realgud:cmdbuf-buffers-describe info)
+ (insert "\n")
+ (realgud:loc-hist-describe (realgud-cmdbuf-info-loc-hist info))
+ (goto-char (point-min))
+ (realgud:info-mode)
+ )
+ (message "realgud-cmdbuf-info is nil")
)
- )
+ ))
(message "Buffer %s is not a debugger source or command buffer; nothing
done."
(or buffer (current-buffer)))
)
@@ -333,6 +346,12 @@ values set in the debugger's init.el."
"Debugger object for a process buffer."))
)
+(defun realgud-cmdbuf-reset (cmd-buf)
+ "nil out variable realgud-cmdbuf-info in CMD-BUF"
+ (with-current-buffer-safe cmd-buf
+ (setq realgud-cmdbuf-info nil)
+ ))
+
(defun realgud-cmdbuf-debugger-name (&optional cmd-buf)
"Return the debugger name recorded in the debugger command-process buffer."
(with-current-buffer-safe (or cmd-buf (current-buffer))
diff --git a/realgud/debugger/jdb/jdb.el b/realgud/debugger/jdb/jdb.el
index 62afcea..bc6815c 100644
--- a/realgud/debugger/jdb/jdb.el
+++ b/realgud/debugger/jdb/jdb.el
@@ -90,9 +90,14 @@ fringe and marginal icons.
(script-name (car script-args))
(parsed-cmd-args
(cl-remove-if 'nil (realgud:flatten parsed-args)))
+ (cmd-buf (realgud:run-process "jdb" script-name parsed-cmd-args
+ 'realgud:jdb-track-mode-hook no-reset))
)
- (realgud:run-process "jdb" script-name parsed-cmd-args
- 'realgud:jdb-track-mode-hook no-reset)
+ (if cmd-buf
+ (with-current-buffer cmd-buf
+ (set (make-local-variable 'realgud:jdb-file-remap))
+ )
+ )
)
)
- [elpa] master 905216f 06/56: Bp tracking respects custom filename lookup ..., (continued)
- [elpa] master 905216f 06/56: Bp tracking respects custom filename lookup ..., Rocky Bernstein, 2017/05/27
- [elpa] master 697daeb 13/56: Tidy code a little, Rocky Bernstein, 2017/05/27
- [elpa] master e62aed9 16/56: describe-variable links to cmd-buf non-nil value, Rocky Bernstein, 2017/05/27
- [elpa] master 1959804 10/56: Small docstring clarification, Rocky Bernstein, 2017/05/27
- [elpa] master 5faeb71 09/56: realgud:cmdbuf-buffers-describe shows field names, Rocky Bernstein, 2017/05/27
- [elpa] master 66abb81 14/56: Tidy code a little, Rocky Bernstein, 2017/05/27
- [elpa] master 2def5fc 20/56: Customizable "search for this (relative) bp file", Rocky Bernstein, 2017/05/27
- [elpa] master bbdeb4e 19/56: Fixes issue #33, Rocky Bernstein, 2017/05/27
- [elpa] master 7323aa7 04/56: Fix up "make dist", Rocky Bernstein, 2017/05/27
- [elpa] master 70f8b03 05/56: Hoist remove-ansi-schmutz above just js, Rocky Bernstein, 2017/05/27
- [elpa] master 7e1db94 07/56: file remapping changes,
Rocky Bernstein <=
- [elpa] master cd61c06 15/56: Tidy a bit, Rocky Bernstein, 2017/05/27
- [elpa] master 447ab36 08/56: host removing ansi-schmutz to mode setting., Rocky Bernstein, 2017/05/27
- [elpa] master 9df42fe 12/56: Towards tracking breakpoints more often, Rocky Bernstein, 2017/05/27
- [elpa] master 4246e34 17/56: Merge pull request #150 from realgud/breakpoint-display, Rocky Bernstein, 2017/05/27
- [elpa] master 0fd9f62 35/56: lint on test, Rocky Bernstein, 2017/05/27
- [elpa] master 52d6b82 23/56: Closer to getting column info used, Rocky Bernstein, 2017/05/27
- [elpa] master 7fac416 29/56: Increase flake8 message coverage..., Rocky Bernstein, 2017/05/27
- [elpa] master 20b8d5d 32/56: Use cl-lib names, Rocky Bernstein, 2017/05/27
- [elpa] master 4f57d25 27/56: Fixes PR review realgud/realgud#163, Rocky Bernstein, 2017/05/27
- [elpa] master f360ead 31/56: Allow nil as file parameter in realgud-exec-shell, Rocky Bernstein, 2017/05/27